Remove Dartium support from test.dart.

tools/testing/dart/test_suite.dart

Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index 2e95a664bd2377dd58211a27d0d1bb1d808ad1a8..d7b169e1e94f991732d024cef2438f094d4cd9f3 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -19,13 +19,13 @@ import 'browser_test.dart';
 import 'command.dart';
 import 'compiler_configuration.dart';
 import 'configuration.dart';
-import 'drt_updater.dart';
 import 'expectation.dart';
 import 'expectation_set.dart';
 import 'html_test.dart' as html_test;
 import 'http_server.dart';
 import 'multitest.dart';
 import 'path.dart';
+import 'runtime_updater.dart';
 import 'summary_report.dart';
 import 'test_configurations.dart';
 import 'test_runner.dart';
@@ -646,7 +646,10 @@ class StandardTestSuite extends TestSuite {
   Future forEachTest(
       Function onTest, Map<String, List<TestInformation>> testCache,
       [VoidFunction onDone]) async {
-    await updateDartium();
+    if (!configuration.listTests) {
+      await updateContentShell(configuration.runtime, configuration.drtPath);
+    }
+
     doTest = onTest;
     testExpectations = readExpectations();
 
@@ -666,24 +669,6 @@ class StandardTestSuite extends TestSuite {
   }
 
   /**
-   * If Content shell/Dartium is required, and not yet updated, waits for
-   * the update then completes. Otherwise completes immediately.
-   */
-  Future updateDartium() {
-    var completer = new Completer();
-    var updater = runtimeUpdater(configuration.runtime, configuration.drtPath,
-        configuration.dartiumPath);
-    if (updater == null || updater.updated) {
-      return new Future.value(null);
-    }
-
-    assert(updater.isActive);
-    updater.onUpdated.add(() => completer.complete(null));
-
-    return completer.future;
-  }
-
-  /**
    * Reads the status files and completes with the parsed expectations.
    */
   ExpectationSet readExpectations() {
@@ -1030,8 +1015,6 @@ class StandardTestSuite extends TestSuite {
       Map<String, Set<Expectation>> expectations,
       List<String> vmOptions,
       String tempDir) {
-    // TODO(Issue 14651): If we're on dartium, we need to pass [packageRoot]
-    // on to the browser (it may be test specific).
     var filePath = info.filePath;
     var fileName = filePath.toNativePath();
 
@@ -1106,10 +1089,10 @@ class StandardTestSuite extends TestSuite {
         break;
 
       case Compiler.dartdevc:
-        var toPath = new Path('$compilationTempDir/$nameNoExt.js')
-            .toNativePath();
-        commands.add(configuration.compilerConfiguration.createCommand(
-            dartWrapperFilename, toPath));
+        var toPath =
+            new Path('$compilationTempDir/$nameNoExt.js').toNativePath();
+        commands.add(configuration.compilerConfiguration
+            .createCommand(dartWrapperFilename, toPath));
         break;
 
       case Compiler.none:
@@ -1127,13 +1110,13 @@ class StandardTestSuite extends TestSuite {
 
       switch (configuration.compiler) {
         case Compiler.dart2js:
-          commands.add(_dart2jsCompileCommand(fromPath.toNativePath(),
-              toPath, tempDir, optionsFromFile));
+          commands.add(_dart2jsCompileCommand(
+              fromPath.toNativePath(), toPath, tempDir, optionsFromFile));
           break;
 
         case Compiler.dartdevc:
-          commands.add(configuration.compilerConfiguration.createCommand(
-              fromPath.toNativePath(), toPath));
+          commands.add(configuration.compilerConfiguration
+              .createCommand(fromPath.toNativePath(), toPath));
           break;
 
         default:

[Bill Hesse, 2017/07/19 14:13:06]

Remove.

[Bob Nystrom, 2017/07/20 00:00:01]

Done.

@@ -1404,8 +1387,8 @@ class StandardTestSuite extends TestSuite {
    * creating additional files in the test directories.
    *
    * Here is a list of options that are used by 'test.dart' today:
-   *   - Flags can be passed to the vm or dartium process that runs the test by
-   *   adding a comment to the test file:
+   *   - Flags can be passed to the vm process that runs the test by adding a
+   *   comment to the test file:
    *
    *     // VMOptions=--flag1 --flag2
    *
@@ -1649,9 +1632,7 @@ class StandardTestSuite extends TestSuite {
       Runtime.dartPrecompiled,
       Runtime.vm,
       Runtime.drt,
-      Runtime.dartium,
-      Runtime.contentShellOnAndroid,
-      Runtime.dartiumOnAndroid
+      Runtime.contentShellOnAndroid
     ];
 
     var needsVmOptions = compilers.contains(configuration.compiler) &&