[telemetry] Simplify the way PageRunner is called.

tools/telemetry/telemetry/page/page_test_runner.py

Index: tools/telemetry/telemetry/page/page_test_runner.py
diff --git a/tools/telemetry/telemetry/page/page_test_runner.py b/tools/telemetry/telemetry/page/page_test_runner.py
index b11659d14422e7172908e86d17950d22836e8ed2..1bfc6c5c94183d49f2f9087102904ed10441fcbe 100644
--- a/tools/telemetry/telemetry/page/page_test_runner.py
+++ b/tools/telemetry/telemetry/page/page_test_runner.py
@@ -4,11 +4,9 @@
 import os
 import sys
 
-from telemetry.core import browser_finder
 from telemetry.core import browser_options
 from telemetry.core import discover
 from telemetry.core import profile_types
-from telemetry.page import gtest_test_results
 from telemetry.page import page_test
 from telemetry.page import page_runner
 from telemetry.page import page_set
@@ -29,18 +27,6 @@ class PageTestRunner(object):
     self._options = None
     self._args = None
 
-  def AddCommandLineOptions(self, parser):
-    parser.add_option('--output-format',
-                      default=self.output_format_choices[0],
-                      choices=self.output_format_choices,
-                      help='Output format. Defaults to "%%default". '
-                      'Can be %s.' % ', '.join(self.output_format_choices))
-
-  @property
-  def output_format_choices(self):
-    """Allowed output formats. The default is the first item in the list."""
-    return ['gtest']
-
   @property
   def test_class(self):
     return page_test.PageTest
@@ -52,8 +38,7 @@ class PageTestRunner(object):
   def Run(self, test_dir, profile_creators_dir, page_set_filenames):
     test, ps = self.ParseCommandLine(
         sys.argv, test_dir, profile_creators_dir, page_set_filenames)
-    results = self.PrepareResults(test)
-    self.RunTestOnPageSet(test, ps, results)
+    results = page_runner.Run(test, ps, self._options)
     results.PrintSummary()
     return min(255, len(results.failures + results.errors))
 
@@ -147,14 +132,14 @@ class PageTestRunner(object):
     self._parser = self._options.CreateParser(
         '%%prog [options] %s page_set' % self.test_class_name)
 
-    self.AddCommandLineOptions(self._parser)
-    page_runner.PageRunner.AddCommandLineOptions(self._parser)
     test_constructors = self.FindTestConstructors(test_dir)
     test_name = self.FindTestName(test_constructors, args)
     test = None
     if test_name:
       test = test_constructors[test_name]()
+      test.AddOutputOptions(self._parser)
       test.AddCommandLineOptions(self._parser)
+    page_runner.AddCommandLineOptions(self._parser)
 
     _, self._args = self._parser.parse_args()
 
@@ -177,25 +162,5 @@ class PageTestRunner(object):
 
     return test, ps
 
-  def PrepareResults(self, test):  #pylint: disable=W0613
-    if self._options.output_format == 'gtest':
-      return gtest_test_results.GTestTestResults()
-    else:
-      # Should never be reached. The parser enforces the choices.
-      raise Exception('Invalid --output-format "%s". Valid choices are: %s'
-                      % (self._options.output_format,
-                         ', '.join(self.output_format_choices)))
-
-  def RunTestOnPageSet(self, test, ps, results):
-    test.CustomizeBrowserOptions(self._options)
-    possible_browser = browser_finder.FindBrowser(self._options)
-    if not possible_browser:
-      self.PrintParseError(
-          'No browser found.\n'
-          'Use --browser=list to figure out which are available.')
-
-    with page_runner.PageRunner(ps) as runner:
-      runner.Run(self._options, possible_browser, test, results)
-
   def PrintParseError(self, message):
     self._parser.error(message)