Changes to run tests on Dartium content shell on Android.

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 1503 matching lines @@
              "isMultiHtmlTest": isMultiHtmlTest,
              "subtestNames": subtestNames,
              "isolateStubs": isolateStubs,
              "containsDomImport": containsDomImport,
              "numStaticTypeAnnotations": numStaticTypeAnnotations,
              "numCompileTimeAnnotations": numCompileTimeAnnotations };
   }
 
   List<List<String>> getVmOptions(Map optionsFromFile) {
     var COMPILERS = const ['none', 'dart2dart'];
-    var RUNTIMES = const ['none', 'vm', 'drt', 'dartium'];
+    var RUNTIMES = const ['none', 'vm', 'drt', 'dartium',
+                          'ContentShellOnAndroid'];
     var needsVmOptions = COMPILERS.contains(configuration['compiler']) &&
                          RUNTIMES.contains(configuration['runtime']);
     if (!needsVmOptions) return [[]];
     final vmOptions = optionsFromFile['vmOptions'];
     if (configuration['compiler'] != 'dart2dart') return vmOptions;
     // Temporary workaround for race in test suite: tests with different
     // vm options are still compiled into the same output file which
     // may lead to reads from empty files.
     return [vmOptions[0]];
   }
@@ skipping 365 matching lines @@
   static bool usesWebDriver(String runtime) {
     const BROWSERS = const [
       'dartium',
       'ie9',
       'ie10',
       'safari',
       'opera',
       'chrome',
       'ff',
       'chromeOnAndroid',
+      'ContentShellOnAndroid'
     ];
     return BROWSERS.contains(runtime);
   }
 
   static bool isBrowserRuntime(String runtime) =>
       runtime == 'drt' || TestUtils.usesWebDriver(runtime);
 
   static bool isJsCommandLineRuntime(String runtime) =>
       const ['d8', 'jsshell'].contains(runtime);
 
@@ skipping 119 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }