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

chrome/test/chromedriver/run_py_tests.py

Index: chrome/test/chromedriver/run_py_tests.py
diff --git a/chrome/test/chromedriver/run_py_tests.py b/chrome/test/chromedriver/run_py_tests.py
index 7cefbc5cb75b2078b25f98e9c5f6ffcf639c2094..b11b24a5a43723a381e619c2ffbb2ed7bd24f848 100755
--- a/chrome/test/chromedriver/run_py_tests.py
+++ b/chrome/test/chromedriver/run_py_tests.py
@@ -143,19 +143,14 @@ class ChromeDriverTest(ChromeDriverBaseTest):
         chrome_paths.GetTestData())
     if _ANDROID_PACKAGE:
       ChromeDriverTest._adb = android_commands.AndroidCommands()
-      forwarder.Forwarder.KillHost('Debug')
-      ChromeDriverTest._forwarder = forwarder.Forwarder(ChromeDriverTest._adb,
-                                                        'Debug')
-      host_port = ChromeDriverTest._http_server._server.server_port
-      ChromeDriverTest._forwarder.Run(
-          [(host_port, host_port)], valgrind_tools.BaseTool())
+      self._host_port = ChromeDriverTest._http_server._server.server_port
+      forwarder.Forwarder.Map(
+          [(self._host_port, self._host_port)], ChromeDriverTest._adb)
 
   @staticmethod
   def GlobalTearDown():
     if _ANDROID_PACKAGE:
-      forwarder.Forwarder.KillDevice(ChromeDriverTest._adb,
-                                     valgrind_tools.BaseTool())
-      ChromeDriverTest._forwarder.Close()
+      forwarder.Forwarder.UnmapAllDevicePorts(ChromeDriverTest._adb)
     ChromeDriverTest._http_server.Shutdown()
 
   @staticmethod