telemetry: Remove PageTest support from benchmark_runner

tools/telemetry/telemetry/benchmark_runner.py

Index: tools/telemetry/telemetry/benchmark_runner.py
diff --git a/tools/telemetry/telemetry/benchmark_runner.py b/tools/telemetry/telemetry/benchmark_runner.py
index b197392a9ce099bfd805c567c2bafa3c161f50dd..342c3a47549dd06227e011080273362eba1f6387 100644
--- a/tools/telemetry/telemetry/benchmark_runner.py
+++ b/tools/telemetry/telemetry/benchmark_runner.py
@@ -22,8 +22,6 @@ from telemetry.core import discover
 from telemetry.core import environment
 from telemetry.core import util
 from telemetry.page import page_set
-from telemetry.page import page_test
-from telemetry.page import profile_creator
 from telemetry.util import find_dependencies
 
 
@@ -153,28 +151,8 @@ class Run(command_line.OptparseCommand):
       sys.exit(-1)
 
     test_class = matching_tests.pop()
-    if issubclass(test_class, page_test.PageTest):
-      if len(args.positional_args) < 2:
-        parser.error('Need to specify a page set for "%s".' % test_class.Name())
-      if len(args.positional_args) > 2:
-        parser.error('Too many arguments.')
-      page_set_name = args.positional_args[1]
-      page_set_class = _MatchPageSetName(page_set_name)
-      if page_set_class is None:
-        parser.error("Page set %s not found. Available sets:\n%s" %
-                     (page_set_name, _AvailablePageSetNamesString()))
-
-      class TestWrapper(benchmark.Benchmark):
-        test = test_class
-
-        @classmethod
-        def CreatePageSet(cls, options):
-          return page_set_class()
-
-      test_class = TestWrapper
-    else:
-      if len(args.positional_args) > 1:
-        parser.error('Too many arguments.')
+    if len(args.positional_args) > 1:
+      parser.error('Too many arguments.')
 
     assert issubclass(test_class, benchmark.Benchmark), (
         'Trying to run a non-Benchmark?!')
@@ -211,11 +189,6 @@ def _Tests():
   for base_dir in config.base_paths:
     tests += discover.DiscoverClasses(base_dir, base_dir, benchmark.Benchmark,
                                       index_by_class_name=True).values()
-    page_tests = discover.DiscoverClasses(base_dir, base_dir,
-                                          page_test.PageTest,
-                                          index_by_class_name=True).values()
-    tests += [test_class for test_class in page_tests
-              if not issubclass(test_class, profile_creator.ProfileCreator)]
   return tests
 
 
@@ -341,15 +314,6 @@ def _PrintTestList(tests):
           test_class.Name(), test_class.Description())
     print >> sys.stderr
 
-  filtered_tests = [test_class for test_class in tests
-                    if issubclass(test_class, page_test.PageTest)]
-  if filtered_tests:
-    print >> sys.stderr, 'Available page tests are:'
-    for test_class in sorted(filtered_tests, key=lambda t: t.Name()):
-      print >> sys.stderr, format_string % (
-          test_class.Name(), test_class.Description())
-    print >> sys.stderr
-
 
 config = environment.Environment([util.GetBaseDir()])