[Android] Remove more uses of android_commands from build/android/pylib. (RELAND)

build/android/pylib/base/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.
 
 """Base class for running tests on a single device."""
 
 # TODO(jbudorick) Deprecate and remove this class and all subclasses after
 # any relevant parts have been ported to the new environment + test instance
 # model.
 
 import logging
 
 from pylib import ports
 from pylib.device import device_utils
 from pylib.forwarder import Forwarder
 from pylib.valgrind_tools import CreateTool
 # TODO(frankf): Move this to pylib/utils
 import lighttpd_server
 
 
 # A file on device to store ports of net test server. The format of the file is
 # test-spawner-server-port:test-server-port
 NET_TEST_SERVER_PORT_INFO_FILE = 'net-test-server-ports'
 
 
 class BaseTestRunner(object):
   """Base class for running tests on a single device."""
 
-  def __init__(self, device_serial, tool):
+  def __init__(self, device, tool):
     """
       Args:
-        device: Tests will run on the device of this ID.
+        device: An instance of DeviceUtils that the tests will run on.
         tool: Name of the Valgrind tool.
     """
-    self.device_serial = device_serial
-    self.device = device_utils.DeviceUtils(device_serial)
+    assert isinstance(device, device_utils.DeviceUtils)
+    self.device = device
+    self.device_serial = self.device.adb.GetDeviceSerial()
     self.tool = CreateTool(tool, self.device)
     self._http_server = None
     self._forwarder_device_port = 8000
     self.forwarder_base_url = ('http://localhost:%d' %
         self._forwarder_device_port)
     # We will allocate port for test server spawner when calling method
     # LaunchChromeTestServerSpawner and allocate port for test server when
     # starting it in TestServerThread.
     self.test_server_spawner_port = 0
     self.test_server_port = 0
@@ skipping 81 matching lines @@
     # will be left open even after the forwarder has been killed.
     if not ports.IsDevicePortUsed(self.device, self._forwarder_device_port):
       self._ForwardPortsForHttpServer()
 
   def ShutdownHelperToolsForTestSuite(self):
     """Shuts down the server and the forwarder."""
     if self._http_server:
       self._UnmapPorts([(self._forwarder_device_port, self._http_server.port)])
       self._http_server.ShutdownHttpServer()