From 5b2bba7dd5a8f0841dede335f5c7d3f6721bcd90 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Fri, 31 Mar 2023 15:03:51 -0700
Subject: [PATCH 1/9] Fail the run_suite_step if any test failures are
 detected.

---
 lib/web_ui/dev/steps/run_suite_step.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/web_ui/dev/steps/run_suite_step.dart b/lib/web_ui/dev/steps/run_suite_step.dart
index 3650670590bff..1e9c7aa57b529 100644
--- a/lib/web_ui/dev/steps/run_suite_step.dart
+++ b/lib/web_ui/dev/steps/run_suite_step.dart
@@ -118,6 +118,7 @@ class RunSuiteStep implements PipelineStep {
     if (io.exitCode != 0) {
       print('[${suite.name.ansiCyan}] ${'Some tests failed.'.ansiRed}');
       io.exitCode = 0;
+      throw ToolExit('Some unit tests failed in suite ${suite.name.ansiCyan}.');
     } else {
       print('[${suite.name.ansiCyan}] ${'All tests passed!'.ansiGreen}');
     }

From 57ec7d368431dce908f6b862fc2aef0f44110b2c Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Fri, 31 Mar 2023 19:38:28 -0700
Subject: [PATCH 2/9] Add comment about exit codes.

---
 lib/web_ui/dev/steps/run_suite_step.dart | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/web_ui/dev/steps/run_suite_step.dart b/lib/web_ui/dev/steps/run_suite_step.dart
index 1e9c7aa57b529..18cec8247ab10 100644
--- a/lib/web_ui/dev/steps/run_suite_step.dart
+++ b/lib/web_ui/dev/steps/run_suite_step.dart
@@ -115,8 +115,13 @@ class RunSuiteStep implements PipelineStep {
 
     await browserEnvironment.cleanup();
 
+    // Since we are just calling `main()` on the test executable, it will modify
+    // the exit code. We use this as a signal that there were some tests that failed.
     if (io.exitCode != 0) {
       print('[${suite.name.ansiCyan}] ${'Some tests failed.'.ansiRed}');
+      // Change the exit code back to 0 when we're done. Failures will be bubbled up
+      // at the end of the pipeline and we'll exit abnormally if there were any
+      // failures in the pipeline.
       io.exitCode = 0;
       throw ToolExit('Some unit tests failed in suite ${suite.name.ansiCyan}.');
     } else {

From dc884231f5a6588c4b67beaeebfa3dc2f421b245 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Mon, 3 Apr 2023 12:02:40 -0700
Subject: [PATCH 3/9] Don't pass null as the argument list to constructors.

---
 lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart b/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
index de79aa6a9a147..2d6b8fde36689 100644
--- a/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
+++ b/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
@@ -3798,7 +3798,7 @@ void patchCanvasKitModule(DomHTMLScriptElement canvasKitScript) {
     final Object? exportsAccessor = js_util.jsify(<String, dynamic>{
       'get': allowInterop(() {
         if (domDocument.currentScript == canvasKitScript) {
-          return js_util.callConstructor(objectConstructor, null);
+          return js_util.callConstructor(objectConstructor, <Object>[]);
         } else {
           return _flutterWebCachedExports;
         }
@@ -3815,7 +3815,7 @@ void patchCanvasKitModule(DomHTMLScriptElement canvasKitScript) {
     final Object? moduleAccessor = js_util.jsify(<String, dynamic>{
       'get': allowInterop(() {
         if (domDocument.currentScript == canvasKitScript) {
-          return js_util.callConstructor(objectConstructor, null);
+          return js_util.callConstructor(objectConstructor, <Object>[]);
         } else {
           return _flutterWebCachedModule;
         }

From 88c5a26334cd51ec6bfa786bcd8a37b3f1b11c11 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Mon, 3 Apr 2023 15:27:23 -0700
Subject: [PATCH 4/9] Use 64-bit chrome on Windows.

---
 .ci.yaml                                  |  2 +-
 ci/builders/linux_web_engine.json         | 64 +++++++++++------------
 lib/web_ui/dev/browser_lock.yaml          |  4 +-
 lib/web_ui/dev/common.dart                |  4 +-
 lib/web_ui/dev/generate_builder_json.dart |  2 +-
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.ci.yaml b/.ci.yaml
index 0e7856c0d5c5e..0e80303bb165c 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -304,7 +304,7 @@ targets:
         {"download_emsdk": true}
       dependencies: >-
         [
-          {"dependency": "chrome_and_driver", "version": "version:111.0"},
+          {"dependency": "chrome_and_driver", "version": "version:111.0a"},
           {"dependency": "curl", "version": "version:7.64.0"}
         ]
       framework: "true"
diff --git a/ci/builders/linux_web_engine.json b/ci/builders/linux_web_engine.json
index 351a6777614e3..8f4afbc93e54c 100644
--- a/ci/builders/linux_web_engine.json
+++ b/ci/builders/linux_web_engine.json
@@ -365,7 +365,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -401,7 +401,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -437,7 +437,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -473,7 +473,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -509,7 +509,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -545,7 +545,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -581,7 +581,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -617,7 +617,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -833,7 +833,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -869,7 +869,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -905,7 +905,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -941,7 +941,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -977,7 +977,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1013,7 +1013,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1049,7 +1049,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1085,7 +1085,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1281,7 +1281,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1317,7 +1317,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1353,7 +1353,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1389,7 +1389,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1425,7 +1425,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1461,7 +1461,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1497,7 +1497,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1533,7 +1533,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1569,7 +1569,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1605,7 +1605,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1641,7 +1641,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1677,7 +1677,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1713,7 +1713,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1749,7 +1749,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1785,7 +1785,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
@@ -1821,7 +1821,7 @@
         },
         {
           "dependency": "chrome_and_driver",
-          "version": "version:111.0"
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
diff --git a/lib/web_ui/dev/browser_lock.yaml b/lib/web_ui/dev/browser_lock.yaml
index eedf5d6828087..94eceed0afcd5 100644
--- a/lib/web_ui/dev/browser_lock.yaml
+++ b/lib/web_ui/dev/browser_lock.yaml
@@ -16,8 +16,8 @@ chrome:
   Linux: 1097615
   Mac: 1097624
   Mac_Arm: 1097626
-  Win: 1097664
-  version: '111.0' # CIPD tag for the above Build IDs. Normally "ChromeMajorVersion.UploadAttempt". ;)
+  Win: 1097610
+  version: '111.0a' # CIPD tag for the above Build IDs. Normally "ChromeMajorVersion.UploadAttempt". ;)
 
 firefox:
   version: '106.0'
diff --git a/lib/web_ui/dev/common.dart b/lib/web_ui/dev/common.dart
index cd61c8f39e196..d8548c1ecbc34 100644
--- a/lib/web_ui/dev/common.dart
+++ b/lib/web_ui/dev/common.dart
@@ -66,11 +66,11 @@ class WindowsPlatformBinding implements PlatformBinding {
 
   @override
   String getChromeDownloadUrl(String version) =>
-      'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Win%2F$version%2Fchrome-win.zip?alt=media';
+      'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Win_x64%2F$version%2Fchrome-win.zip?alt=media';
 
   @override
   String getChromeDriverDownloadUrl(String version) =>
-      'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Win%2F$version%2Fchromedriver_win32.zip?alt=media';
+      'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Win_x64%2F$version%2Fchromedriver_win32.zip?alt=media';
 
   @override
   String getChromeExecutablePath(io.Directory versionDir) =>
diff --git a/lib/web_ui/dev/generate_builder_json.dart b/lib/web_ui/dev/generate_builder_json.dart
index 719d088824f0f..05f4e03efbd80 100644
--- a/lib/web_ui/dev/generate_builder_json.dart
+++ b/lib/web_ui/dev/generate_builder_json.dart
@@ -149,7 +149,7 @@ Iterable<dynamic> _getTestStepsForPlatform(
           if (suite.runConfig.browser == BrowserName.chrome)
             <String, dynamic>{
               'dependency': 'chrome_and_driver',
-              'version': 'version:111.0',
+              'version': 'version:111.0a',
             },
           if (suite.runConfig.browser == BrowserName.firefox)
             <String, dynamic>{

From 6eba6745272efb0360a1afa0c4bc7656af17cb11 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Mon, 3 Apr 2023 15:36:15 -0700
Subject: [PATCH 5/9] Some fixes for timeouts.

---
 lib/web_ui/test/canvaskit/canvas_golden_test.dart   | 2 +-
 lib/web_ui/test/canvaskit/text_fragmenter_test.dart | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web_ui/test/canvaskit/canvas_golden_test.dart b/lib/web_ui/test/canvaskit/canvas_golden_test.dart
index b3790cf78bac4..7ad4aea6556da 100644
--- a/lib/web_ui/test/canvaskit/canvas_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/canvas_golden_test.dart
@@ -802,7 +802,7 @@ void testMain() {
 
     test('emoji text with skin tone', () async {
       await testSampleText('emoji_with_skin_tone', '👋🏿 👋🏾 👋🏽 👋🏼 👋🏻');
-    });
+    }, skip: isWasm); // https://github.com/flutter/flutter/issues/124068
 
     // Make sure we clear the canvas in between frames.
     test('empty frame after contentful frame', () async {
diff --git a/lib/web_ui/test/canvaskit/text_fragmenter_test.dart b/lib/web_ui/test/canvaskit/text_fragmenter_test.dart
index 420b1aaa70858..365de0c8677a2 100644
--- a/lib/web_ui/test/canvaskit/text_fragmenter_test.dart
+++ b/lib/web_ui/test/canvaskit/text_fragmenter_test.dart
@@ -183,7 +183,7 @@ void testMain() {
       testCacheCapacity(segmentationCache.small, kSmallParagraphCacheSpec);
       testCacheCapacity(segmentationCache.medium, kMediumParagraphCacheSpec);
       testCacheCapacity(segmentationCache.large, kLargeParagraphCacheSpec);
-    });
+    }, timeout: const Timeout.factor(4));
   }, skip: !browserSupportsCanvaskitChromium);
 }
 

From 08f36aaf9127da110692dc8f75562add489da67e Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Mon, 3 Apr 2023 16:01:59 -0700
Subject: [PATCH 6/9] Don't re-enable on firefox/safari.

---
 lib/web_ui/test/canvaskit/canvas_golden_test.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web_ui/test/canvaskit/canvas_golden_test.dart b/lib/web_ui/test/canvaskit/canvas_golden_test.dart
index 7ad4aea6556da..5d77675283f84 100644
--- a/lib/web_ui/test/canvaskit/canvas_golden_test.dart
+++ b/lib/web_ui/test/canvaskit/canvas_golden_test.dart
@@ -802,7 +802,7 @@ void testMain() {
 
     test('emoji text with skin tone', () async {
       await testSampleText('emoji_with_skin_tone', '👋🏿 👋🏾 👋🏽 👋🏼 👋🏻');
-    }, skip: isWasm); // https://github.com/flutter/flutter/issues/124068
+    }, skip: isWasm || isSafari || isFirefox); // https://github.com/flutter/flutter/issues/124068
 
     // Make sure we clear the canvas in between frames.
     test('empty frame after contentful frame', () async {

From 29a81ffc681d15eaaf443c98323d7a22787e4e95 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Mon, 3 Apr 2023 17:10:45 -0700
Subject: [PATCH 7/9] Disable dart2wasm tests on Windows.

---
 ci/builders/linux_web_engine.json         | 302 +++++++++++++++-------
 lib/web_ui/dev/generate_builder_json.dart |  28 +-
 2 files changed, 231 insertions(+), 99 deletions(-)

diff --git a/ci/builders/linux_web_engine.json b/ci/builders/linux_web_engine.json
index 8f4afbc93e54c..a84bb38ca5740 100644
--- a/ci/builders/linux_web_engine.json
+++ b/ci/builders/linux_web_engine.json
@@ -1101,7 +1101,7 @@
       ]
     },
     {
-      "name": "Mac run safari-dart2js-html-engine suite",
+      "name": "Mac run chrome-dart2js-html-engine suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1118,22 +1118,26 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite safari-dart2js-html-engine",
+          "name": "run suite chrome-dart2js-html-engine",
           "parameters": [
             "test",
             "--run",
-            "--suite=safari-dart2js-html-engine"
+            "--suite=chrome-dart2js-html-engine"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Mac run safari-dart2js-html-html suite",
+      "name": "Mac run chrome-dart2js-html-html suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1150,22 +1154,26 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite safari-dart2js-html-html",
+          "name": "run suite chrome-dart2js-html-html",
           "parameters": [
             "test",
             "--run",
-            "--suite=safari-dart2js-html-html"
+            "--suite=chrome-dart2js-html-html"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Mac run safari-dart2js-html-ui suite",
+      "name": "Mac run chrome-dart2js-html-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1182,22 +1190,26 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite safari-dart2js-html-ui",
+          "name": "run suite chrome-dart2js-html-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=safari-dart2js-html-ui"
+            "--suite=chrome-dart2js-html-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Mac run safari-dart2js-canvaskit-canvaskit suite",
+      "name": "Mac run chrome-dart2js-canvaskit-canvaskit suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1214,22 +1226,26 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite safari-dart2js-canvaskit-canvaskit",
+          "name": "run suite chrome-dart2js-canvaskit-canvaskit",
           "parameters": [
             "test",
             "--run",
-            "--suite=safari-dart2js-canvaskit-canvaskit"
+            "--suite=chrome-dart2js-canvaskit-canvaskit"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Mac run safari-dart2js-canvaskit-ui suite",
+      "name": "Mac run chrome-dart2js-canvaskit-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1246,33 +1262,37 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite safari-dart2js-canvaskit-ui",
+          "name": "run suite chrome-dart2js-canvaskit-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=safari-dart2js-canvaskit-ui"
+            "--suite=chrome-dart2js-canvaskit-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2js-html-engine suite",
+      "name": "Mac run chrome-dart2js-skwasm-skwasm_stub suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
-        "os=Windows"
+        "os=Mac"
       ],
       "gclient_variables": {
         "download_android_deps": false
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-html-engine"
+        "web_tests/test_bundles/dart2js-skwasm-skwasm_stub"
       ],
       "test_dependencies": [
         {
@@ -1286,29 +1306,29 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-html-engine",
+          "name": "run suite chrome-dart2js-skwasm-skwasm_stub",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-html-engine"
+            "--suite=chrome-dart2js-skwasm-skwasm_stub"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2js-html-html suite",
+      "name": "Mac run chrome-full-dart2js-canvaskit-canvaskit suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
-        "os=Windows"
+        "os=Mac"
       ],
       "gclient_variables": {
         "download_android_deps": false
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-html-html"
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
       ],
       "test_dependencies": [
         {
@@ -1322,29 +1342,29 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-html-html",
+          "name": "run suite chrome-full-dart2js-canvaskit-canvaskit",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-html-html"
+            "--suite=chrome-full-dart2js-canvaskit-canvaskit"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2js-html-ui suite",
+      "name": "Mac run chrome-full-dart2js-canvaskit-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
-        "os=Windows"
+        "os=Mac"
       ],
       "gclient_variables": {
         "download_android_deps": false
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-html-ui"
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
       ],
       "test_dependencies": [
         {
@@ -1358,29 +1378,29 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-html-ui",
+          "name": "run suite chrome-full-dart2js-canvaskit-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-html-ui"
+            "--suite=chrome-full-dart2js-canvaskit-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2js-canvaskit-canvaskit suite",
+      "name": "Mac run chrome-dart2wasm-html-engine suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
-        "os=Windows"
+        "os=Mac"
       ],
       "gclient_variables": {
         "download_android_deps": false
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
+        "web_tests/test_bundles/dart2wasm-html-engine"
       ],
       "test_dependencies": [
         {
@@ -1394,29 +1414,29 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-canvaskit-canvaskit",
+          "name": "run suite chrome-dart2wasm-html-engine",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-canvaskit-canvaskit"
+            "--suite=chrome-dart2wasm-html-engine"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2js-canvaskit-ui suite",
+      "name": "Mac run chrome-dart2wasm-html-html suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
-        "os=Windows"
+        "os=Mac"
       ],
       "gclient_variables": {
         "download_android_deps": false
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-canvaskit-ui"
+        "web_tests/test_bundles/dart2wasm-html-html"
       ],
       "test_dependencies": [
         {
@@ -1430,29 +1450,29 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-canvaskit-ui",
+          "name": "run suite chrome-dart2wasm-html-html",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-canvaskit-ui"
+            "--suite=chrome-dart2wasm-html-html"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2js-skwasm-skwasm_stub suite",
+      "name": "Mac run chrome-dart2wasm-html-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
-        "os=Windows"
+        "os=Mac"
       ],
       "gclient_variables": {
         "download_android_deps": false
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-skwasm-skwasm_stub"
+        "web_tests/test_bundles/dart2wasm-html-ui"
       ],
       "test_dependencies": [
         {
@@ -1466,29 +1486,29 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-skwasm-skwasm_stub",
+          "name": "run suite chrome-dart2wasm-html-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-skwasm-skwasm_stub"
+            "--suite=chrome-dart2wasm-html-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-full-dart2js-canvaskit-canvaskit suite",
+      "name": "Mac run chrome-dart2wasm-canvaskit-canvaskit suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
-        "os=Windows"
+        "os=Mac"
       ],
       "gclient_variables": {
         "download_android_deps": false
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
+        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
       ],
       "test_dependencies": [
         {
@@ -1502,29 +1522,29 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-full-dart2js-canvaskit-canvaskit",
+          "name": "run suite chrome-dart2wasm-canvaskit-canvaskit",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-full-dart2js-canvaskit-canvaskit"
+            "--suite=chrome-dart2wasm-canvaskit-canvaskit"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-full-dart2js-canvaskit-ui suite",
+      "name": "Mac run chrome-dart2wasm-canvaskit-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
-        "os=Windows"
+        "os=Mac"
       ],
       "gclient_variables": {
         "download_android_deps": false
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-canvaskit-ui"
+        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
       ],
       "test_dependencies": [
         {
@@ -1538,18 +1558,126 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-full-dart2js-canvaskit-ui",
+          "name": "run suite chrome-dart2wasm-canvaskit-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-full-dart2js-canvaskit-ui"
+            "--suite=chrome-dart2wasm-canvaskit-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2wasm-html-engine suite",
+      "name": "Mac run chrome-dart2wasm-skwasm-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-skwasm-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "version:111.0a"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-dart2wasm-skwasm-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-dart2wasm-skwasm-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Mac run chrome-full-dart2wasm-canvaskit-canvaskit suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "version:111.0a"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2wasm-canvaskit-canvaskit",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2wasm-canvaskit-canvaskit"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Mac run chrome-full-dart2wasm-canvaskit-ui suite",
+      "recipe": "engine_v2/tester_engine",
+      "drone_dimensions": [
+        "device_type=none",
+        "os=Mac"
+      ],
+      "gclient_variables": {
+        "download_android_deps": false
+      },
+      "dependencies": [
+        "web_tests/artifacts",
+        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
+      ],
+      "test_dependencies": [
+        {
+          "dependency": "goldctl",
+          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
+        },
+        {
+          "dependency": "chrome_and_driver",
+          "version": "version:111.0a"
+        }
+      ],
+      "tasks": [
+        {
+          "name": "run suite chrome-full-dart2wasm-canvaskit-ui",
+          "parameters": [
+            "test",
+            "--run",
+            "--suite=chrome-full-dart2wasm-canvaskit-ui"
+          ],
+          "script": "flutter/lib/web_ui/dev/felt"
+        }
+      ]
+    },
+    {
+      "name": "Windows run chrome-dart2js-html-engine suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1560,7 +1688,7 @@
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-html-engine"
+        "web_tests/test_bundles/dart2js-html-engine"
       ],
       "test_dependencies": [
         {
@@ -1574,18 +1702,18 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2wasm-html-engine",
+          "name": "run suite chrome-dart2js-html-engine",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2wasm-html-engine"
+            "--suite=chrome-dart2js-html-engine"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2wasm-html-html suite",
+      "name": "Windows run chrome-dart2js-html-html suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1596,7 +1724,7 @@
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-html-html"
+        "web_tests/test_bundles/dart2js-html-html"
       ],
       "test_dependencies": [
         {
@@ -1610,18 +1738,18 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2wasm-html-html",
+          "name": "run suite chrome-dart2js-html-html",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2wasm-html-html"
+            "--suite=chrome-dart2js-html-html"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2wasm-html-ui suite",
+      "name": "Windows run chrome-dart2js-html-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1632,7 +1760,7 @@
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-html-ui"
+        "web_tests/test_bundles/dart2js-html-ui"
       ],
       "test_dependencies": [
         {
@@ -1646,18 +1774,18 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2wasm-html-ui",
+          "name": "run suite chrome-dart2js-html-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2wasm-html-ui"
+            "--suite=chrome-dart2js-html-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2wasm-canvaskit-canvaskit suite",
+      "name": "Windows run chrome-dart2js-canvaskit-canvaskit suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1668,7 +1796,7 @@
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
       ],
       "test_dependencies": [
         {
@@ -1682,18 +1810,18 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2wasm-canvaskit-canvaskit",
+          "name": "run suite chrome-dart2js-canvaskit-canvaskit",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2wasm-canvaskit-canvaskit"
+            "--suite=chrome-dart2js-canvaskit-canvaskit"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2wasm-canvaskit-ui suite",
+      "name": "Windows run chrome-dart2js-canvaskit-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1704,7 +1832,7 @@
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
       ],
       "test_dependencies": [
         {
@@ -1718,18 +1846,18 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2wasm-canvaskit-ui",
+          "name": "run suite chrome-dart2js-canvaskit-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2wasm-canvaskit-ui"
+            "--suite=chrome-dart2js-canvaskit-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-dart2wasm-skwasm-ui suite",
+      "name": "Windows run chrome-dart2js-skwasm-skwasm_stub suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1740,7 +1868,7 @@
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-skwasm-ui"
+        "web_tests/test_bundles/dart2js-skwasm-skwasm_stub"
       ],
       "test_dependencies": [
         {
@@ -1754,18 +1882,18 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2wasm-skwasm-ui",
+          "name": "run suite chrome-dart2js-skwasm-skwasm_stub",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2wasm-skwasm-ui"
+            "--suite=chrome-dart2js-skwasm-skwasm_stub"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-full-dart2wasm-canvaskit-canvaskit suite",
+      "name": "Windows run chrome-full-dart2js-canvaskit-canvaskit suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1776,7 +1904,7 @@
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
+        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
       ],
       "test_dependencies": [
         {
@@ -1790,18 +1918,18 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-full-dart2wasm-canvaskit-canvaskit",
+          "name": "run suite chrome-full-dart2js-canvaskit-canvaskit",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-full-dart2wasm-canvaskit-canvaskit"
+            "--suite=chrome-full-dart2js-canvaskit-canvaskit"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Windows run chrome-full-dart2wasm-canvaskit-ui suite",
+      "name": "Windows run chrome-full-dart2js-canvaskit-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1812,7 +1940,7 @@
       },
       "dependencies": [
         "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
+        "web_tests/test_bundles/dart2js-canvaskit-ui"
       ],
       "test_dependencies": [
         {
@@ -1826,11 +1954,11 @@
       ],
       "tasks": [
         {
-          "name": "run suite chrome-full-dart2wasm-canvaskit-ui",
+          "name": "run suite chrome-full-dart2js-canvaskit-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-full-dart2wasm-canvaskit-ui"
+            "--suite=chrome-full-dart2js-canvaskit-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
diff --git a/lib/web_ui/dev/generate_builder_json.dart b/lib/web_ui/dev/generate_builder_json.dart
index 05f4e03efbd80..ee0a821ff6cf3 100644
--- a/lib/web_ui/dev/generate_builder_json.dart
+++ b/lib/web_ui/dev/generate_builder_json.dart
@@ -108,25 +108,29 @@ Map<String, dynamic> _getBundleBuildStep(TestBundle bundle) {
 
 Iterable<dynamic> _getAllTestSteps(List<TestSuite> suites) {
   return <dynamic>[
-    ..._getTestStepsForPlatform(suites, 'Linux', <BrowserName>{
-      BrowserName.chrome,
-      BrowserName.firefox,
-    }),
-    ..._getTestStepsForPlatform(suites, 'Mac', <BrowserName>{
-      BrowserName.safari,
-    }),
-    ..._getTestStepsForPlatform(suites, 'Windows', <BrowserName>{
-      BrowserName.chrome,
-    }),
+    ..._getTestStepsForPlatform(suites, 'Linux', (TestSuite suite) =>
+      suite.runConfig.browser == BrowserName.chrome ||
+      suite.runConfig.browser == BrowserName.firefox
+    ),
+    ..._getTestStepsForPlatform(suites, 'Mac', (TestSuite suite) =>
+      suite.runConfig.browser == BrowserName.chrome
+    ),
+    ..._getTestStepsForPlatform(suites, 'Windows', (TestSuite suite) =>
+      suite.runConfig.browser == BrowserName.chrome &&
+
+      // TODO(jacksongardner): Enable dart2wasm tests on Windows
+      // https://github.com/flutter/flutter/issues/124082
+      suite.testBundle.compileConfig.compiler != Compiler.dart2wasm
+    ),
   ];
 }
 
 Iterable<dynamic> _getTestStepsForPlatform(
   List<TestSuite> suites,
   String platform,
-  Set<BrowserName> browsers) {
+  bool Function(TestSuite suite) filter) {
   return suites
-    .where((TestSuite suite) => browsers.contains(suite.runConfig.browser))
+    .where(filter)
     .map((TestSuite suite) => <String, dynamic>{
         'name': '$platform run ${suite.name} suite',
         'recipe': 'engine_v2/tester_engine',

From 092a347d767368179137c855434be60147f139b1 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Mon, 3 Apr 2023 17:17:04 -0700
Subject: [PATCH 8/9] Mac should run Safari, not Chrome.

---
 lib/web_ui/dev/generate_builder_json.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web_ui/dev/generate_builder_json.dart b/lib/web_ui/dev/generate_builder_json.dart
index ee0a821ff6cf3..68c89a7c4e5f9 100644
--- a/lib/web_ui/dev/generate_builder_json.dart
+++ b/lib/web_ui/dev/generate_builder_json.dart
@@ -113,7 +113,7 @@ Iterable<dynamic> _getAllTestSteps(List<TestSuite> suites) {
       suite.runConfig.browser == BrowserName.firefox
     ),
     ..._getTestStepsForPlatform(suites, 'Mac', (TestSuite suite) =>
-      suite.runConfig.browser == BrowserName.chrome
+      suite.runConfig.browser == BrowserName.safari
     ),
     ..._getTestStepsForPlatform(suites, 'Windows', (TestSuite suite) =>
       suite.runConfig.browser == BrowserName.chrome &&

From 4c5bbbd981841ad24ac23988ba9f10fdab95955d Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Mon, 3 Apr 2023 17:18:35 -0700
Subject: [PATCH 9/9] Regenerate builder json.

---
 ci/builders/linux_web_engine.json | 446 +-----------------------------
 1 file changed, 15 insertions(+), 431 deletions(-)

diff --git a/ci/builders/linux_web_engine.json b/ci/builders/linux_web_engine.json
index a84bb38ca5740..ddb871b0076c6 100644
--- a/ci/builders/linux_web_engine.json
+++ b/ci/builders/linux_web_engine.json
@@ -1101,7 +1101,7 @@
       ]
     },
     {
-      "name": "Mac run chrome-dart2js-html-engine suite",
+      "name": "Mac run safari-dart2js-html-engine suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1118,26 +1118,22 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-html-engine",
+          "name": "run suite safari-dart2js-html-engine",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-html-engine"
+            "--suite=safari-dart2js-html-engine"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Mac run chrome-dart2js-html-html suite",
+      "name": "Mac run safari-dart2js-html-html suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1154,26 +1150,22 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-html-html",
+          "name": "run suite safari-dart2js-html-html",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-html-html"
+            "--suite=safari-dart2js-html-html"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Mac run chrome-dart2js-html-ui suite",
+      "name": "Mac run safari-dart2js-html-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1190,134 +1182,22 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-dart2js-html-ui",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-dart2js-html-ui"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2js-canvaskit-canvaskit suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-canvaskit-canvaskit"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-dart2js-canvaskit-canvaskit",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-dart2js-canvaskit-canvaskit"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2js-canvaskit-ui suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-canvaskit-ui"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-dart2js-canvaskit-ui",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-dart2js-canvaskit-ui"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2js-skwasm-skwasm_stub suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2js-skwasm-skwasm_stub"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2js-skwasm-skwasm_stub",
+          "name": "run suite safari-dart2js-html-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2js-skwasm-skwasm_stub"
+            "--suite=safari-dart2js-html-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Mac run chrome-full-dart2js-canvaskit-canvaskit suite",
+      "name": "Mac run safari-dart2js-canvaskit-canvaskit suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1334,26 +1214,22 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite chrome-full-dart2js-canvaskit-canvaskit",
+          "name": "run suite safari-dart2js-canvaskit-canvaskit",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-full-dart2js-canvaskit-canvaskit"
+            "--suite=safari-dart2js-canvaskit-canvaskit"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }
       ]
     },
     {
-      "name": "Mac run chrome-full-dart2js-canvaskit-ui suite",
+      "name": "Mac run safari-dart2js-canvaskit-ui suite",
       "recipe": "engine_v2/tester_engine",
       "drone_dimensions": [
         "device_type=none",
@@ -1370,307 +1246,15 @@
         {
           "dependency": "goldctl",
           "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-full-dart2js-canvaskit-ui",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-full-dart2js-canvaskit-ui"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2wasm-html-engine suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-html-engine"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-dart2wasm-html-engine",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-dart2wasm-html-engine"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2wasm-html-html suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-html-html"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
         }
       ],
       "tasks": [
         {
-          "name": "run suite chrome-dart2wasm-html-html",
+          "name": "run suite safari-dart2js-canvaskit-ui",
           "parameters": [
             "test",
             "--run",
-            "--suite=chrome-dart2wasm-html-html"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2wasm-html-ui suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-html-ui"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-dart2wasm-html-ui",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-dart2wasm-html-ui"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2wasm-canvaskit-canvaskit suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-dart2wasm-canvaskit-canvaskit",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-dart2wasm-canvaskit-canvaskit"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2wasm-canvaskit-ui suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-dart2wasm-canvaskit-ui",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-dart2wasm-canvaskit-ui"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-dart2wasm-skwasm-ui suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-skwasm-ui"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-dart2wasm-skwasm-ui",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-dart2wasm-skwasm-ui"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-full-dart2wasm-canvaskit-canvaskit suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-canvaskit-canvaskit"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-full-dart2wasm-canvaskit-canvaskit",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-full-dart2wasm-canvaskit-canvaskit"
-          ],
-          "script": "flutter/lib/web_ui/dev/felt"
-        }
-      ]
-    },
-    {
-      "name": "Mac run chrome-full-dart2wasm-canvaskit-ui suite",
-      "recipe": "engine_v2/tester_engine",
-      "drone_dimensions": [
-        "device_type=none",
-        "os=Mac"
-      ],
-      "gclient_variables": {
-        "download_android_deps": false
-      },
-      "dependencies": [
-        "web_tests/artifacts",
-        "web_tests/test_bundles/dart2wasm-canvaskit-ui"
-      ],
-      "test_dependencies": [
-        {
-          "dependency": "goldctl",
-          "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"
-        },
-        {
-          "dependency": "chrome_and_driver",
-          "version": "version:111.0a"
-        }
-      ],
-      "tasks": [
-        {
-          "name": "run suite chrome-full-dart2wasm-canvaskit-ui",
-          "parameters": [
-            "test",
-            "--run",
-            "--suite=chrome-full-dart2wasm-canvaskit-ui"
+            "--suite=safari-dart2js-canvaskit-ui"
           ],
           "script": "flutter/lib/web_ui/dev/felt"
         }