test.py: Propagate the global --dartium option to the browser controller

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 891 matching lines @@
     // Note: If we run test.py with the "--list" option, no http servers
     // will be started. So we use PORT/CROSS_ORIGIN_PORT instead of real ports.
     var serverPort = "PORT";
     var crossOriginPort = "CROSS_ORIGIN_PORT";
     if (!configuration['list']) {
       assert(configuration.containsKey('_servers_'));
       serverPort = configuration['_servers_'].port;
       crossOriginPort = configuration['_servers_'].crossOriginPort;
     }
 
-    var local_ip = configuration['local_ip'];
-    var url= 'http://$local_ip:$serverPort$pathComponent'
+    var localIp = configuration['local_ip'];
+    var url= 'http://$localIp:$serverPort$pathComponent'
         '?crossOriginPort=$crossOriginPort';
     if (info.optionsFromFile['isMultiHtmlTest'] && subtestNames.length > 0) {
       url= '${url}&group=${subtestNames[subtestIndex]}';
     }
     return url;
   }
 
   void _createWrapperFile(String dartWrapperFilename,
                           Path dartLibraryFilename,
                           {bool useUnittestWrapper: false}) {
@@ skipping 204 matching lines @@
               runtime, fullHtmlPath,
               TestUtils.dartTestExecutable.toString(), args, configurationDir));
         } else if (TestUtils.usesWebDriver(runtime)) {
           args = [
               dartDir.append('tools/testing/run_selenium.py').toNativePath(),
               '--browser=$runtime',
               // NOTE: This value will be overridden by the test runner
               '--timeout=${configuration['timeout']}',
               '--out=$fullHtmlPath'];
           if (runtime == 'dartium') {
-            args.add('--executable=$dartiumFilename');
+            var dartiumLocation = Locations.getDartiumLocation(configuration);
+            args.add('--executable=$dartiumLocation');
           }
           if (subtestIndex != 0) {
             args.add('--force-refresh');
           }
           commandSet.add(CommandBuilder.instance.getSeleniumTestCommand(
                   runtime, fullHtmlPath, 'python', args, configurationDir));
         } else {
           assert(runtime == "drt");
 
           var dartFlags = [];
@@ skipping 152 matching lines @@
       return configuration['drt'];
     }
     if (Platform.operatingSystem == 'macos') {
       final path = dartDir.append(
           '/client/tests/drt/Content Shell.app/Contents/MacOS/Content Shell');
       return path.toNativePath();
     }
     return dartDir.append('client/tests/drt/content_shell').toNativePath();
   }
 
-  String get dartiumFilename {
-    if (configuration['dartium'] != '') {
-      return configuration['dartium'];
-    }
-    if (Platform.operatingSystem == 'macos') {
-      return dartDir.append('client/tests/dartium/Chromium.app/Contents/'
-                            'MacOS/Chromium').toNativePath();
-    }
-    return dartDir.append('client/tests/dartium/chrome').toNativePath();
-  }
-
   List<String> commonArgumentsFromFile(Path filePath, Map optionsFromFile) {
     List args = TestUtils.standardOptions(configuration);
 
     String packageRoot = packageRootArgument(optionsFromFile['packageRoot']);
     if (packageRoot != null) {
       args.add(packageRoot);
     }
     args.addAll(additionalOptions(filePath));
     if (configuration['analyzer']) {
       args.add('--machine');
@@ skipping 738 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);
    }
 }