[chromedriver] Fix error due to remove of chrome/test/pylib/common.

chrome/test/chromedriver/test_environment.py

 # Copyright (c) 2012 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.
 
 """TestEnvironment classes.
 
 These classes abstract away the various setups needed to run the WebDriver java
 tests in various environments.
 """
 
 import os
 import sys
 
+import util
+
 _THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 
-sys.path.insert(0, os.path.join(_THIS_DIR, os.pardir, 'pylib'))
-
-from common import util
-
 if util.IsLinux():
   sys.path.insert(0, os.path.join(_THIS_DIR, os.pardir, os.pardir, os.pardir,
                                   'build', 'android'))
   from pylib import android_commands
   from pylib import forwarder
   from pylib import valgrind_tools
 
 ANDROID_TEST_HTTP_PORT = 2311
 ANDROID_TEST_HTTPS_PORT = 2411
 
@@ skipping 41 matching lines @@
     """
     with open(os.path.join(_THIS_DIR, 'java_tests.txt'), 'r') as f:
       return _EXPECTATIONS['ApplyJavaTestFilter'](
           self.GetOS(), self._chrome_version,
           [t.strip('\n') for t in f.readlines()])
 
 
 class DesktopTestEnvironment(BaseTestEnvironment):
   """Manages the environment java tests require to run on Desktop."""
 
-  #override
+  # override
   def GetOS(self):
     return util.GetPlatformName()
 
 
 class AndroidTestEnvironment(DesktopTestEnvironment):
   """Manages the environment java tests require to run on Android."""
 
   def __init__(self, chrome_version='HEAD'):
     super(AndroidTestEnvironment, self).__init__(chrome_version)
     self._adb = None
     self._forwarder = None
 
-  #override
+  # override
   def GlobalSetUp(self):
     os.putenv('TEST_HTTP_PORT', str(ANDROID_TEST_HTTP_PORT))
     os.putenv('TEST_HTTPS_PORT', str(ANDROID_TEST_HTTPS_PORT))
     self._adb = android_commands.AndroidCommands()
     self._forwarder = forwarder.Forwarder(self._adb, 'Debug')
     self._forwarder.Run(
         [(ANDROID_TEST_HTTP_PORT, ANDROID_TEST_HTTP_PORT),
          (ANDROID_TEST_HTTPS_PORT, ANDROID_TEST_HTTPS_PORT)],
         valgrind_tools.BaseTool(), '127.0.0.1')
 
-  #override
+  # override
   def GlobalTearDown(self):
     if self._adb is not None:
       forwarder.Forwarder.KillDevice(self._adb, valgrind_tools.BaseTool())
     if self._forwarder is not None:
       self._forwarder.Close()
 
-  #override
+  # override
   def GetOS(self):
     return 'android'