Revert 212020 "Move Python setup/tear down logic into Forwarder ..."

trunk/src/chrome/test/chromedriver/run_py_tests.py

Index: trunk/src/chrome/test/chromedriver/run_py_tests.py
===================================================================
--- trunk/src/chrome/test/chromedriver/run_py_tests.py	(revision 212053)
+++ trunk/src/chrome/test/chromedriver/run_py_tests.py	(working copy)
@@ -143,14 +143,19 @@
         chrome_paths.GetTestData())
     if _ANDROID_PACKAGE:
       ChromeDriverTest._adb = android_commands.AndroidCommands()
-      self._host_port = ChromeDriverTest._http_server._server.server_port
-      forwarder.Forwarder.Map(
-          [(self._host_port, self._host_port)], ChromeDriverTest._adb)
+      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())
 
   @staticmethod
   def GlobalTearDown():
     if _ANDROID_PACKAGE:
-      forwarder.Forwarder.UnmapAllDevicePorts(ChromeDriverTest._adb)
+      forwarder.Forwarder.KillDevice(ChromeDriverTest._adb,
+                                     valgrind_tools.BaseTool())
+      ChromeDriverTest._forwarder.Close()
     ChromeDriverTest._http_server.Shutdown()
 
   @staticmethod