Use the new forwarder2's Daemon implementation in device_forwarder.

build/android/pylib/base_test_runner.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.
 
 import contextlib
 import httplib
 import logging
 import os
 import tempfile
 import time
@@ skipping 64 matching lines @@
     if not self.HasTests():
       return True
     self.SetUp()
     try:
       return self.RunTests()
     finally:
       self.TearDown()
 
   def SetUp(self):
     """Called before tests run."""
-    Forwarder.KillDevice(self.adb)
+    Forwarder.KillDevice(self.adb, self.build_type)
 
   def HasTests(self):
     """Whether the test suite has tests to run."""
     return True
 
   def RunTests(self):
     """Runs the tests. Need to be overridden."""
     raise NotImplementedError
 
   def TearDown(self):
@@ skipping 66 matching lines @@
     # will be left open even after the forwarder has been killed.
     if not ports.IsDevicePortUsed(self.adb,
         self._forwarder_device_port):
       self.StartForwarderForHttpServer()
 
   def ShutdownHelperToolsForTestSuite(self):
     """Shuts down the server and the forwarder."""
     # Forwarders should be killed before the actual servers they're forwarding
     # to as they are clients potentially with open connections and to allow for
     # proper hand-shake/shutdown.
-    Forwarder.KillDevice(self.adb)
+    Forwarder.KillDevice(self.adb, self.build_type)
     if self._http_server:
       self._http_server.ShutdownHttpServer()
     if self._spawning_server:
       self._spawning_server.Stop()
     self.flags.Restore()
 
   def LaunchChromeTestServerSpawner(self):
     """Launches test server spawner."""
     server_ready = False
     error_msgs = []
@@ skipping 18 matching lines @@
       # Wait for 2 seconds then restart.
       time.sleep(2)
     if not server_ready:
       logging.error(';'.join(error_msgs))
       raise Exception('Can not start the test spawner server.')
     self._PushTestServerPortInfoToDevice()
     self._spawner_forwarder = self._CreateAndRunForwarder(
         self.adb,
         [(self.test_server_spawner_port, self.test_server_spawner_port)],
         self.tool, '127.0.0.1', self.build_type)