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

chrome/test/chromedriver/test_environment.py

Index: chrome/test/chromedriver/test_environment.py
diff --git a/chrome/test/chromedriver/test_environment.py b/chrome/test/chromedriver/test_environment.py
index 2344ad3a79ade0589d8b61c128c5fa6779cd54ca..ebcbd0f152b95b1942d3a986570135f6ff5ff00f 100644
--- a/chrome/test/chromedriver/test_environment.py
+++ b/chrome/test/chromedriver/test_environment.py
@@ -94,14 +94,19 @@ class AndroidTestEnvironment(DesktopTestEnvironment):
     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.Map(
+    forwarder.Forwarder.KillHost('Debug')
+    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)],
-        self._adb)
+        valgrind_tools.BaseTool())
 
   # override
   def GlobalTearDown(self):
-    forwarder.Forwarder.UnmapAllDevicePorts(self._adb)
+    if self._adb is not None:
+      forwarder.Forwarder.KillDevice(self._adb, valgrind_tools.BaseTool())
+    if self._forwarder is not None:
+      self._forwarder.Close()
 
   # override
   def GetOS(self):