Code cleanup

Author: elliette

.github/workflows/build.yaml

@@ -208,7 +208,7 @@ jobs:
         # TODO(https://github.com/flutter/devtools/issues/9357): Re-enable tests on windows-latest.
         os: [macos-latest]
         # Consider running integration tests in ddc mode, too.
-        bot: [integration_dart2js, integration_wasm]
+        bot: [integration_dart2js, integration_dart2wasm]
         device: [flutter, flutter-web, dart-cli]
         # Option 1/1 will run all tests for a device in a single shard.
         # Option 1/2 and 2/2 should be enabled to run tests for a device in 2 shards.

packages/devtools_app/integration_test/test_infra/run/_test_app_driver.dart

@@ -33,22 +33,6 @@ class TestFlutterApp extends IntegrationTestApp {
       ],
       workingDirectory: testAppPath,
     );
-
-    // runProcess = await Process.start(
-    //   Platform.isWindows
-    //       ? 'flutter.bat'
-    //       : '/Users/elliottbrooks/dev/flutter/bin/dart',
-    //   [
-    //     '/Users/elliottbrooks/dev/flutter/packages/flutter_tools/bin/flutter_tools.dart',
-    //     'run',
-    //     '--machine',
-    //     '-d',
-    //     testAppDevice.argName,
-    //     // Do not serve DevTools from Flutter Tools.
-    //     '--no-devtools',
-    //   ],
-    //   workingDirectory: testAppPath,
-    // );
   }
 
   @override

packages/devtools_shared/lib/src/test/integration_test_runner.dart

@@ -227,7 +227,7 @@ class IntegrationTestRunnerArgs {
   /// instead of 'chrome'.
   bool get headless => argResults.flag(_headlessArg);
 
-  /// Whether this integration test should be run on wasm.
+  /// Whether this integration test should be run against dart2wasm-compiled DevTools.
   bool get useWasm => argResults.flag(_wasmArg);
 
   /// Sharding information for this test run.
@@ -288,7 +288,7 @@ class IntegrationTestRunnerArgs {
       ..addFlag(
         _wasmArg,
         negatable: false,
-        help: 'Runs the integration test on wasm.',
+        help: 'Runs the integration test against dart2wasm-compiled DevTools.',
       )
       ..addOption(
         _shardArg,

tool/ci/bots.sh

@@ -72,11 +72,11 @@ elif [ "$BOT" = "test_webdriver" ]; then
 # elif [ "$BOT" = "integration_ddc" ]; then
 
 # TODO(https://github.com/flutter/devtools/issues/1987): rewrite legacy integration tests.
-elif [[ "$BOT" == "integration_dart2js" || "$BOT" == "integration_wasm" ]]; then
-    if [ "$BOT" == "integration_wasm" ]; then
-        MAYBE_WASM_FLAG="--wasm"
+elif [[ "$BOT" == "integration_dart2js" || "$BOT" == "integration_dart2wasm" ]]; then
+    if [ "$BOT" == "integration_dart2wasm" ]; then
+        WASM_FLAG="--wasm"
     else
-        MAYBE_WASM_FLAG=""
+        WASM_FLAG=""
     fi
 
     if [ "$DEVTOOLS_PACKAGE" = "devtools_app" ]; then
@@ -91,15 +91,15 @@ run to see if golden image failures have been uploaded (this only happens once a
 completed). Download these goldens and update them in the codebase to apply the updates."
 
         if [ "$DEVICE" = "flutter" ]; then
-            dart run integration_test/run_tests.dart $MAYBE_WASM_FLAG --headless --shard="$SHARD"
+            dart run integration_test/run_tests.dart $WASM_FLAG --headless --shard="$SHARD"
         elif [ "$DEVICE" = "flutter-web" ]; then
-            dart run integration_test/run_tests.dart --test-app-device=chrome $MAYBE_WASM_FLAG --headless --shard="$SHARD"
+            dart run integration_test/run_tests.dart --test-app-device=chrome $WASM_FLAG --headless --shard="$SHARD"
         elif [ "$DEVICE" = "dart-cli" ]; then
-            dart run integration_test/run_tests.dart --test-app-device=cli $MAYBE_WASM_FLAG --headless --shard="$SHARD"
+            dart run integration_test/run_tests.dart --test-app-device=cli $WASM_FLAG --headless --shard="$SHARD"
         fi
     elif [ "$DEVTOOLS_PACKAGE" = "devtools_extensions" ]; then
         pushd $DEVTOOLS_DIR/packages/devtools_extensions
-        dart run integration_test/run_tests.dart $MAYBE_WASM_FLAG --headless
+        dart run integration_test/run_tests.dart $WASM_FLAG --headless
         popd
     fi
 fi