Revert r13442. The extension fails to install under Windows, and the sentinel

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 123 matching lines @@
   """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':
-    script_dir = os.path.dirname(os.path.abspath(__file__))
-    crx = os.path.join(script_dir, 'extensions', 'chrome',
-                       'ConsoleCollector.crx')
-    options = selenium.webdriver.chrome.options.Options()
-    options.add_extension(crx)
     # 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(chrome_options=options)
+    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')
-    crx = os.path.join(script_dir, 'extensions', 'chrome',
-                       'ConsoleCollector.crx')
     options = selenium.webdriver.chrome.options.Options()
-    options.add_extension(crx)
     # 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)
-    xpi = os.path.join(script_dir, 'extensions', 'firefox',
-        'ConsoleCollector.xpi')
+    xpi = os.path.join(script_dir, 'extensions', 'firefox',                               'ConsoleCollector.xpi')
     profile.add_extension(xpi);
     return selenium.webdriver.Firefox(firefox_profile=profile)
   elif browser == 'ie' and platform.system() == 'Windows':
     return selenium.webdriver.Ie()
   elif browser == 'safari' and platform.system() == 'Darwin':
     # TODO(efortuna): Ensure our preferences (no pop-up blocking) file is the
     # same (Safari auto-deletes when it has too many "crashes," or in our case,
     # timeouts). Come up with a less hacky way to do this.
     backup_safari_prefs = os.path.dirname(__file__) + '/com.apple.Safari.plist'
     if os.path.exists(backup_safari_prefs):
@@ skipping 53 matching lines @@
       print 'Content-Type: text/plain\nPASS'
       return 0
     else:
       #The hacky way to get document.getElementById('body').innerHTML for this
       # webpage, without the JavaScript.
       #TODO(efortuna): Access these elements in a nicer way using DOM parser.
       index = source.find('<body>')
       index += len('<body>')
       end_index = source.find('</body')
       print unicode(source[index : end_index]).encode("utf-8")
-      logs = []
       if type(browser) is selenium.webdriver.firefox.webdriver.WebDriver:
         logs = browser.execute_script("return window.ConsoleCollector.read()");
-      elif type(browser) is selenium.webdriver.chrome.webdriver.WebDriver:
-        browser.set_script_timeout(100)
-        logs = browser.execute_async_script(
-            "getMessages(arguments[arguments.length-1])");
-      for msg in logs:
-        print('%s:%s:%s %s' %(
-            msg['source'], msg['line'], msg['category'], msg['message']))
+        for msg in logs:
+          print('%s:%s:%s:%s %s' %(
+              msg['source'], msg['line'], msg['column'],
+              msg['category'], msg['message']))
       return 1
 
 
 def run_batch_tests():
   '''
   Runs a batch of in-browser tests in the same browser process. Batching
   gives faster throughput and makes tests less subject to browser starting
   flakiness, issues with too many browser processes running, etc.
 
   When running this function, stdin/stdout is used to communicate with the test
@@ skipping 74 matching lines @@
   browser = start_browser(browser_name, executable_path, html_out)
 
   try:
     output = run_test_in_browser(browser, html_out, timeout, mode)
     return report_results(mode, output, browser)
   finally:
     close_browser(browser)
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv))