Reland r212020: Move Python setup/tear down logic into Forwarder ...

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.
 """
 
@@ skipping 76 matching lines @@
   def __init__(self, chrome_version='HEAD'):
     super(AndroidTestEnvironment, self).__init__(chrome_version)
     self._adb = None
     self._forwarder = None
 
   # 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()
-    forwarder.Forwarder.KillHost('Debug')
-    self._forwarder = forwarder.Forwarder(self._adb, 'Debug')
-    self._forwarder.Run(
+    forwarder.Forwarder.Map(
         [(ANDROID_TEST_HTTP_PORT, ANDROID_TEST_HTTP_PORT),
          (ANDROID_TEST_HTTPS_PORT, ANDROID_TEST_HTTPS_PORT)],
-        valgrind_tools.BaseTool())
+        self._adb)
 
   # 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()
+    forwarder.Forwarder.UnmapAllDevicePorts(self._adb)
 
   # override
   def GetOS(self):
     return 'android'