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

build/android/pylib/host_driven/test_case.py

 # Copyright 2013 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 host-driven test cases.
 
 This test case is intended to serve as the base class for any host-driven
 test cases. It is similar to the Python unitttest module in that test cases
 inherit from this class and add methods which will be run as tests.
 
@@ skipping 50 matching lines @@
     # tests in the overall results.
     self.test_name = test_name
     self.qualified_name = '%s.%s' % (class_name, self.test_name)
     self.tagged_name = '%s_%s' % (self._HOST_DRIVEN_TAG, self.qualified_name)
 
   # TODO(bulach): make ports_to_forward not optional and move the Forwarder
   # mapping here.
   def SetUp(self, device, shard_index, ports_to_forward=None):
     if not ports_to_forward:
       ports_to_forward = []
-    self.device_id = device
+    self.device = device
     self.shard_index = shard_index
-    self.device = device_utils.DeviceUtils(self.device_id)
+    self.device_id = str(self.device)
     if ports_to_forward:
       self.ports_to_forward = ports_to_forward
 
   def TearDown(self):
     pass
 
   # TODO(craigdh): Remove GetOutDir once references have been removed
   # downstream.
   @staticmethod
   def GetOutDir():
@@ skipping 26 matching lines @@
       test: Fully qualified test name (ex. foo.bar.TestClass#testMethod)
       test_pkg: TestPackage object.
       additional_flags: A list of additional flags to add to the command line.
 
     Returns:
       TestRunResults object with a single test result.
     """
     # TODO(bulach): move this to SetUp() stage.
     self.__StartForwarder()
 
-    java_test_runner = test_runner.TestRunner(self.instrumentation_options,
-                                              self.device_id,
-                                              self.shard_index, test_pkg,
-                                              additional_flags=additional_flags)
+    java_test_runner = test_runner.TestRunner(
+        self.instrumentation_options, self.device, self.shard_index,
+        test_pkg, additional_flags=additional_flags)
     try:
       java_test_runner.SetUp()
       return java_test_runner.RunTest(test)[0]
     finally:
       java_test_runner.TearDown()
 
   def _RunJavaTestFilters(self, test_filters, additional_flags=None):
     """Calls a list of tests and stops at the first test failure.
 
     This method iterates until either it encounters a non-passing test or it
@@ skipping 47 matching lines @@
     overall_result.AddResult(
         test_result.InstrumentationTestResult(
             self.tagged_name, test_type, start_ms, duration_ms, log=log))
     return overall_result
 
   def __str__(self):
     return self.tagged_name
 
   def __repr__(self):
     return self.tagged_name