"Reverting 16675-16676, 71-73"

tools/testing/run_selenium.py

 #!/usr/bin/python
 
 # Copyright (c) 2011, 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.
 #
 
 """Script to actually open a browser and perform the test, and reports back with
 the result. It uses Selenium WebDriver when possible for running the tests. It
 uses Selenium RC for Safari.
@@ skipping 132 matching lines @@
 def print_server_error():
   """Provide the user an informative error message if we attempt to connect to
   the Selenium remote control server, but cannot access it. Then exit the
   program."""
   print ('ERROR: Could not connect to Selenium RC server. Are you running'
       ' java -jar tools/testing/selenium-server-standalone-*.jar? If not, '
       'start it before running this test.')
   sys.exit(1)
 
 def start_browser(browser, executable_path, html_out):
-  if browser == 'chrome' or browser == 'dartium':
+  if browser == 'chrome':
     # Note: you need ChromeDriver *in your path* to run Chrome, in addition to
     # installing Chrome. Also note that the build bot runs have a different path
     # from a normal user -- check the build logs.
+    return selenium.webdriver.Chrome()
+  elif browser == 'dartium':
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    dartium_dir = os.path.join(script_dir, '..', '..', 'client', 'tests',
+                               'dartium')
     options = selenium.webdriver.chrome.options.Options()
-    if browser == 'dartium':
-      script_dir = os.path.dirname(os.path.abspath(__file__))
-      dartium_dir = os.path.join(script_dir, '..', '..', 'client', 'tests',
-                                 'dartium')
-      # enable ShadowDOM and style scoped for Dartium
-      options.add_argument('--enable-shadow-dom')
-      options.add_argument('--enable-style-scoped')
-      if executable_path is not None:
-        options.binary_location = executable_path
-      elif platform.system() == 'Windows':
-        options.binary_location = os.path.join(dartium_dir, 'chrome.exe')
-      elif platform.system() == 'Darwin':
-        options.binary_location = os.path.join(dartium_dir, 'Chromium.app',
-                                               'Contents', 'MacOS', 'Chromium')
-      else:
-        options.binary_location = os.path.join(dartium_dir, 'chrome')
+    # enable ShadowDOM and style scoped for Dartium
+    options.add_argument('--enable-shadow-dom')
+    options.add_argument('--enable-style-scoped')
+    if executable_path is not None:
+      options.binary_location = executable_path
+    elif platform.system() == 'Windows':
+      options.binary_location = os.path.join(dartium_dir, 'chrome.exe')
+    elif platform.system() == 'Darwin':
+      options.binary_location = os.path.join(dartium_dir, 'Chromium.app',
+                                             'Contents', 'MacOS', 'Chromium')
+    else:
+      options.binary_location = os.path.join(dartium_dir, 'chrome')
     return selenium.webdriver.Chrome(chrome_options=options)
   elif browser == 'ff':
     script_dir = os.path.dirname(os.path.abspath(__file__))
     profile = selenium.webdriver.firefox.firefox_profile.FirefoxProfile()
     profile.set_preference('dom.max_script_run_time', 0)
     profile.set_preference('dom.max_chrome_script_run_time', 0)
     profile.set_preference('app.update.auto', True)
     profile.set_preference('app.update.enabled', True)
     return selenium.webdriver.Firefox(firefox_profile=profile)
   elif ((browser == 'ie9' or browser == 'ie10') and
@@ skipping 173 matching lines @@
   browser = start_browser(browser_name, executable_path, html_out)
 
   try:
     output = run_test_in_browser(browser, html_out, timeout, mode, refresh)
     return report_results(mode, output, browser)
   finally:
     close_browser(browser)
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv))