Revert 182991

tools/telemetry/examples/rendering_microbenchmark_test.py

Index: tools/telemetry/examples/rendering_microbenchmark_test.py
===================================================================
--- tools/telemetry/examples/rendering_microbenchmark_test.py	(revision 182999)
+++ tools/telemetry/examples/rendering_microbenchmark_test.py	(working copy)
@@ -8,11 +8,10 @@
 
 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)
@@ -29,10 +28,10 @@
       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]