Support HTTP test-server based net unit tests on Android.

build/android/pylib/chrome_test_server_spawner.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A "Test Server Spawner" that handles killing/stopping per-test test servers.
 
 It's used to accept requests from the device to spawn and kill instances of the
 chrome test server on the host.
 """
 
@@ skipping 199 matching lines @@
     command = [os.path.join(constants.CHROME_DIR, 'net', 'tools',
                             'testserver', 'testserver.py')] + self.command_line
     logging.info('Running: %s', command)
     self.process = subprocess.Popen(command)
     if self.process:
       if self.pipe_out:
         self.is_ready = self._WaitToStartAndGetPortFromTestServer()
       else:
         self.is_ready = _CheckPortStatus(self.host_port, True)
     if self.is_ready:
-      self._test_server_forwarder = Forwarder(
-          self.adb, [(0, self.host_port)], self.tool, '127.0.0.1',
-          self.build_type)
+      self._test_server_forwarder = Forwarder(self.adb, self.build_type)
+      self._test_server_forwarder.Run(
+          [(0, self.host_port)], self.tool, '127.0.0.1')
       # Check whether the forwarder is ready on the device.
       self.is_ready = False
       device_port = self._test_server_forwarder.DevicePortForHostPort(
           self.host_port)
       if device_port:
         for timeout in range(1, 5):
           if ports.IsDevicePortUsed(self.adb, device_port, 'LISTEN'):
             self.is_ready = True
             self.forwarder_device_port = device_port
             break
@@ skipping 160 matching lines @@
   def Start(self):
     listener_thread = threading.Thread(target=self._Listen)
     listener_thread.setDaemon(True)
     listener_thread.start()
     time.sleep(1)
 
   def Stop(self):
     if self.server.test_server_instance:
       self.server.test_server_instance.Stop()
     self.server.shutdown()