Move Python setup/tear down logic into Forwarder itself.

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 440a3fb95af3277c174e2b8774f7dcd6c95f4038..66ef8e1eb657e8efc18b5f371be61a313e9fc3b7 100755
--- a/chrome/test/chromedriver/run_py_tests.py
+++ b/chrome/test/chromedriver/run_py_tests.py
@@ -143,18 +143,15 @@ class ChromeDriverTest(ChromeDriverBaseTest):
         chrome_paths.GetTestData())
     if _ANDROID_PACKAGE:
       ChromeDriverTest._adb = android_commands.AndroidCommands()
-      ChromeDriverTest._forwarder = forwarder.Forwarder(ChromeDriverTest._adb,

[frankf, 2013/07/15 22:23:22]

You need to rebase, KillHost was added here.

[Philippe, 2013/07/16 12:31:21]

Indeed :)

-                                                        '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.UnmapDevicePort(
+          self._host_port, ChromeDriverTest._adb)
     ChromeDriverTest._http_server.Shutdown()
 
   @staticmethod