Revert 182991

tools/telemetry/examples/rendering_microbenchmark_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import os
 import re
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
-from telemetry.core import browser_finder
-from telemetry.core import browser_options
+import telemetry
 
 def Main(args):
-  options = browser_options.BrowserOptions()
+  options = telemetry.BrowserOptions()
   parser = options.CreateParser('rendering_microbenchmark_test.py <sitelist>')
   # TODO(nduca): Add test specific options here, if any.
   options, args = parser.parse_args(args)
   if len(args) != 1:
     parser.print_usage()
     return 255
 
   urls = []
   with open(args[0], 'r') as f:
     for url in f.readlines():
       url = url.strip()
       if not re.match('(.+)://', url):
         url = 'http://%s' % url
       urls.append(url)
 
   options.extra_browser_args.append('--enable-gpu-benchmarking')
-  browser_to_create = browser_finder.FindBrowser(options)
+  browser_to_create = telemetry.FindBrowser(options)
   if not browser_to_create:
     sys.stderr.write('No browser found! Supported types: %s' %
-        browser_finder.GetAllAvailableBrowserTypes(options))
+        telemetry.GetAllAvailableBrowserTypes(options))
     return 255
   with browser_to_create.Create() as b:
     tab = b.tabs[0]
     # Check browser for benchmark API. Can only be done on non-chrome URLs.
     tab.Navigate('http://www.google.com')
     import time
     time.sleep(2)
     tab.WaitForDocumentReadyStateToBeComplete()
     if tab.EvaluateJavaScript('window.chrome.gpuBenchmarking === undefined'):
       print 'Browser does not support gpu benchmarks API.'
@@ skipping 22 matching lines @@
       tab.Navigate(u)
       tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
       results = tab.EvaluateJavaScript(
           'window.chrome.gpuBenchmarking.runRenderingBenchmarks();')
       DumpResults(url, results)
 
   return 0
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv[1:]))