Revert of [Telemetry] Pass test_runner environment in local args instead of a global variable

content/test/gpu/run_gpu_test.py

Index: content/test/gpu/run_gpu_test.py
diff --git a/content/test/gpu/run_gpu_test.py b/content/test/gpu/run_gpu_test.py
index 797973c0c6c06f075ab8a433332f1251d5878bb4..0cdfbf078455d1f7bac72b7e81ec9bcfda1c329b 100755
--- a/content/test/gpu/run_gpu_test.py
+++ b/content/test/gpu/run_gpu_test.py
@@ -12,6 +12,7 @@
     os.pardir, os.pardir, os.pardir, 'tools', 'telemetry'))
 
 from telemetry import benchmark_runner
+from telemetry.core import environment
 
 
 def _LaunchDBus():
@@ -84,14 +85,12 @@
 
 
 if __name__ == '__main__':
-  top_level_dir = os.path.dirname(os.path.realpath(__file__))
-  environment = benchmark_runner.Environment(
-      top_level_dir=top_level_dir,
-      benchmark_dirs=[os.path.join(top_level_dir, 'gpu_tests')])
+  base_dir = os.path.dirname(os.path.realpath(__file__))
+  benchmark_runner.config = environment.Environment([base_dir])
 
   did_launch_dbus = _LaunchDBus()
   try:
-    retcode = benchmark_runner.main(environment)
+    retcode = benchmark_runner.main()
   finally:
     if did_launch_dbus:
       _ShutdownDBus()