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

build/android/pylib/instrumentation/test_runner.py

Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index a2692faf65e6c1608765fcb6bff815639150b2c0..5fa11357314c68ef718169a221f20cd761fbfe1e 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -153,11 +153,13 @@ class TestRunner(base_test_runner.BaseTestRunner):
     http_server_ports = self.LaunchTestHttpServer(
         os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
     if self.ports_to_forward:
-      self.StartForwarder([(port, port) for port in self.ports_to_forward])
+      self.ForwardPorts([(port, port) for port in self.ports_to_forward])
     self.flags.AddFlags(['--enable-test-intents'])
 
   def TearDown(self):
     """Cleans up the test harness and saves outstanding data from test run."""
+    if self.ports_to_forward:
+      self._UnmapPortPairs(self.ports_to_forward)
     super(TestRunner, self).TearDown()
 
   def TestSetup(self, test):
@@ -171,7 +173,7 @@ class TestRunner(base_test_runner.BaseTestRunner):
     self.tool.SetupEnvironment()
 
     # Make sure the forwarder is still running.
-    self.RestartHttpServerForwarderIfNecessary()
+    self._RestartHttpServerForwarderIfNecessary()
 
   def _IsPerfTest(self, test):
     """Determines whether a test is a performance test.