[telemetry] Prototype for specifying page sets using Python imports and Telemetry discovery.

tools/perf/run_benchmark

Index: tools/perf/run_benchmark
diff --git a/tools/perf/run_benchmark b/tools/perf/run_benchmark
index 3ed33afaa337a6f52316c8834eb361c47f31b563..dc568c1fd285ef88781b9c0d05fd9ae5bab947eb 100755
--- a/tools/perf/run_benchmark
+++ b/tools/perf/run_benchmark
@@ -9,11 +9,10 @@ import sys
 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry'))
 
 from telemetry import test_runner
-from telemetry.core import environment
 
 
 if __name__ == '__main__':
-  base_dir = os.path.dirname(os.path.realpath(__file__))
+  top_level_dir = os.path.dirname(os.path.realpath(__file__))
   test_aliases = {
       'blink_perf': 'blink_perf.all',
       'image_decoding.tough_decoding_cases':
@@ -21,5 +20,12 @@ if __name__ == '__main__':
       'media.tough_media_cases': 'media.tough_video_cases',
       'page_cycler.pica': 'pica.pica',
   }
-  test_runner.config = environment.Environment([base_dir], test_aliases)
-  sys.exit(test_runner.main())
+
+  environment = test_runner.Environment(
+    top_level_dir=top_level_dir,
+    test_dirs=[os.path.join(top_level_dir, 'benchmarks')],
+    page_test_dirs=[os.path.join(top_level_dir, 'measurements')],
+    page_set_dirs=[os.path.join(top_level_dir, 'page_sets')],
+    test_aliases=test_aliases
+  )
+  sys.exit(test_runner.main(environment))