Revert 158940 - Adapt python scripts to use the new Forwarder2

build/android/pylib/run_java_tests.py

Index: build/android/pylib/run_java_tests.py
===================================================================
--- build/android/pylib/run_java_tests.py	(revision 158959)
+++ build/android/pylib/run_java_tests.py	(working copy)
@@ -130,7 +130,8 @@
     self.ports_to_forward = ports_to_forward
 
     self.test_results = TestResults()
-    self.forwarder = None
+    # List of forwarders created by this instance of TestRunner.
+    self.forwarders = []
 
     if self.coverage:
       if os.path.exists(TestRunner._COVERAGE_MERGED_FILENAME):
@@ -276,17 +277,19 @@
     self.LaunchTestHttpServer(os.path.join(constants.CHROME_DIR),
                               (constants.LIGHTTPD_RANDOM_PORT_FIRST +
                                self.shard_index))
+
     if self.ports_to_forward:
-      port_pairs = [(port, port) for port in self.ports_to_forward]
-      self.forwarder = Forwarder(
-         self.adb, port_pairs, self.tool, '127.0.0.1', self.build_type)
+      for port in self.ports_to_forward:
+        self.forwarders.append(Forwarder(
+            self.adb, [(port, port)], self.tool, '127.0.0.1', self.build_type))
     self.CopyTestFilesOnce()
     self.flags.AddFlags(['--enable-test-intents'])
 
   def TearDown(self):
     """Cleans up the test harness and saves outstanding data from test run."""
-    if self.forwarder:
-      self.forwarder.Close()
+    if self.forwarders:
+      for forwarder in self.forwarders:
+        forwarder.Close()
     self.GenerateCoverageReportIfNeeded()
     super(TestRunner, self).TearDown()