Remove Dartium support from test.dart.

tools/testing/dart/options.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:io';
 
 import 'configuration.dart';
-import 'drt_updater.dart';
 import 'path.dart';
+import 'runtime_updater.dart';
 import 'utils.dart';
 
 const _defaultTestSelectors = const [
   'samples',
   'standalone',
   'corelib',
   'corelib_2',
   'co19',
   'language',
   'language_2',
@@ skipping 103 matching lines @@
                   standalone dart VM lacking a JIT.
 
 d8:               Run JavaScript from the command line using v8.
 
 jsshell:          Run JavaScript from the command line using
                   Firefox js-shell.
 
 drt:              Run Dart or JavaScript in the headless version
                   of Chrome, Content shell.
 
-dartium:          Run Dart or JavaScript in Dartium.
-
-ContentShellOnAndroid: Run Dart or JavaScript in Dartium content
-                  shell on Android.
-
-DartiumOnAndroid: Run Dart or Javascript in Dartium on Android.
+ContentShellOnAndroid: Run Dart or JavaScript in content shell
+                  on Android.
 
 ff:
 chrome:
 safari:
 ie9:
 ie10:
 ie11:
 opera:
 chromeOnAndroid:  Run JavaScript in the specified browser.
 
@@ skipping 66 matching lines @@
     new _Option.bool('verbose', 'Verbose output.', 'v'),
     new _Option.bool('verify-ir', 'Verify kernel IR.'),
     new _Option.bool('no-tree-shake', 'Disable kernel IR tree shaking.'),
     new _Option.bool('list', 'List tests only, do not run them.'),
     new _Option.bool('report_in_json',
         'When listing with --list, output result summary in JSON.'),
     new _Option.bool('time', 'Print timing information after running tests.'),
     new _Option('dart', 'Path to dart executable.'),
     new _Option('flutter', 'Path to flutter executable.'),
     new _Option('drt', 'Path to content shell executable.'),
-    new _Option('dartium', 'Path to Dartium Chrome executable.'),
     new _Option('firefox', 'Path to firefox browser executable.'),
     new _Option('chrome', 'Path to chrome browser executable.'),
     new _Option('safari', 'Path to safari browser executable.'),
-    new _Option.bool(
-        'use_sdk',
-        '''Use compiler or runtime from the SDK.
+    new _Option.bool('use_sdk', '''Use compiler or runtime from the SDK.
 
 Normally, the compiler or runtimes in PRODUCT_DIR is tested, with
 this option, the compiler or runtime in PRODUCT_DIR/dart-sdk/bin
 is tested.
 
 (Note: currently only implemented for dart2js.)'''),
     // TODO(rnystrom): This does not appear to be used. Remove?
     new _Option('build_directory',
         'The name of the build directory, where products are placed.'),
     new _Option.bool('noBatch', 'Do not run tests in batch mode.', 'n'),
     new _Option.bool('dart2js_batch', 'Run dart2js tests in batch mode.'),
     new _Option.bool(
         'append_logs', 'Do not delete old logs but rather append to them.'),
     new _Option.bool('write_debug_log',
         'Don\'t write debug messages to stdout but rather to a logfile.'),
     new _Option.bool('write_test_outcome_log',
         'Write test outcomes to a "${TestUtils.testOutcomeFileName}" file.'),
-    new _Option.bool(
-        'reset_browser_configuration',
+    new _Option.bool('reset_browser_configuration',
         '''Browser specific reset of configuration.
 
 Warning: Using this option may remove your bookmarks and other
 settings.'''),
-    new _Option.bool(
-        'copy_coredumps',
+    new _Option.bool('copy_coredumps',
         '''If we see a crash that we did not expect, copy the core dumps to
 "/tmp".'''),
     new _Option(
         'local_ip',
         '''IP address the HTTP servers should listen on. This address is also
 used for browsers to connect to.''',
         defaultsTo: '127.0.0.1'),
     new _Option.int('test_server_port', 'Port for test http server.',
         defaultsTo: 0),
     new _Option.int('test_server_cross_origin_port',
         'Port for test http server cross origin.',
         defaultsTo: 0),
     new _Option.int('test_driver_port', 'Port for http test driver server.',
         defaultsTo: 0),
     new _Option.int(
         'test_driver_error_port', 'Port for http test driver server errors.',
         defaultsTo: 0),
-    new _Option(
-        'builder_tag',
+    new _Option('builder_tag',
         '''Machine specific options that is not captured by the regular test
 options. Used to be able to make sane updates to the status files.'''),
     new _Option('vm_options', 'Extra options to send to the vm when running.'),
     new _Option(
         'dart2js_options', 'Extra options for dart2js compilation step.'),
     new _Option(
         'suite_dir', 'Additional directory to add to the testing matrix.'),
     new _Option('package_root', 'The package root to use for testing.'),
     new _Option('packages', 'The package spec file to use for testing.'),
-    new _Option(
-        'exclude_suite',
+    new _Option('exclude_suite',
         '''Exclude suites from default selector, only works when no selector
 has been specified on the command line.'''),
-    new _Option.bool(
-        'skip_compilation',
-        '''
+    new _Option.bool('skip_compilation', '''
 Skip the compilation step, using the compilation artifacts left in
 the output folder from a previous run. This flag will often cause
 false positves and negatives, but can be useful for quick and
 dirty offline testing when not making changes that affect the
 compiler.''')
   ];
 
   /// For printing out reproducing command lines, we don't want to add these
   /// options.
   static final _blacklistedOptions = [
     'append_logs',
     'build_directory',
     'chrome',
     'copy_coredumps',
     'dart',
     'flutter',
-    'dartium',
     'drt',
     'exclude_suite',
     'firefox',
     'local_ip',
     'progress',
     'report',
     'safari',
     'shard',
     'shards',
     'step_name',
@@ skipping 226 matching lines @@
     // progress indication is requested.
     if ((data['verbose'] as bool) &&
         (data['progress'] as String) != 'buildbot') {
       data['progress'] = 'verbose';
     }
 
     // Expand runtimes.
     for (var runtimeName in (data["runtime"] as String).split(",")) {
       var runtime = Runtime.find(runtimeName);
 
-      // Install the runtime if needed.
-      var updater = runtimeUpdater(
-          runtime, data["drt"] as String, data["dartium"] as String);
-      if (updater != null) {
-        updater.update();
+      // Start installing the runtime if needed.
+      if (runtime == Runtime.drt && !(data["list"] as bool)) {
+        updateContentShell(data["drt"] as String);
       }
 
       // Expand architectures.
       var architectures = data["arch"] as String;
       if (architectures == "all") {
         architectures = "ia32,x64,simarm,simarm64,simdbc64";
       }
 
       for (var architectureName in architectures.split(",")) {
         var architecture = Architecture.find(architectureName);
@@ skipping 36 matching lines @@
                 resetBrowser: data["reset_browser_configuration"] as bool,
                 skipCompilation: data["skip_compilation"] as bool,
                 useBlobs: data["use_blobs"] as bool,
                 useSdk: data["use_sdk"] as bool,
                 useFastStartup: data["fast_startup"] as bool,
                 useEnableAsserts: data["enable_asserts"] as bool,
                 useDart2JSWithKernel: data["dart2js_with_kernel"] as bool,
                 writeDebugLog: data["write_debug_log"] as bool,
                 writeTestOutcomeLog: data["write_test_outcome_log"] as bool,
                 drtPath: data["drt"] as String,
-                dartiumPath: data["dartium"] as String,
                 chromePath: data["chrome"] as String,
                 safariPath: data["safari"] as String,
                 firefoxPath: data["firefox"] as String,
                 dartPath: data["dart"] as String,
                 dartPrecompiledPath: data["dart_precompiled"] as String,
                 flutterPath: data["flutter"] as String,
                 taskCount: data["tasks"] as int,
                 timeout: data["timeout"] as int,
                 shardCount: data["shards"] as int,
                 shard: data["shard"] as int,
@@ skipping 142 matching lines @@
       if (name == option.name) return option;
 
       // Allow hyphens instead of underscores as the separator since they are
       // more common for command line flags.
       if (name == option.name.replaceAll("_", "-")) return option;
     }
 
     return null;
   }
 }