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

content/test/gpu/run_gpu_test.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 import subprocess
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__),
     os.pardir, os.pardir, os.pardir, 'tools', 'telemetry'))
 
 from telemetry import benchmark_runner
+from telemetry.core import environment
 
 
 def _LaunchDBus():
   """Launches DBus to work around a bug in GLib.
 
   Works around a bug in GLib where it performs operations which aren't
   async-signal-safe (in particular, memory allocations) between fork and exec
   when it spawns subprocesses. This causes threads inside Chrome's browser and
   utility processes to get stuck, and this harness to hang waiting for those
   processes, which will never terminate. This doesn't happen on users'
@@ skipping 52 matching lines @@
       print ' error killing dbus-daemon with PID %s: %s' % (dbus_pid, e)
   # Try to clean up any stray DBUS_SESSION_BUS_ADDRESS environment
   # variable too. Some of the bots seem to re-invoke runtest.py in a
   # way that this variable sticks around from run to run.
   if 'DBUS_SESSION_BUS_ADDRESS' in os.environ:
     del os.environ['DBUS_SESSION_BUS_ADDRESS']
     print ' cleared DBUS_SESSION_BUS_ADDRESS environment variable'
 
 
 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()
 
   sys.exit(retcode)