[Android] Configurable instrumentation test runner + test SDK levels.

build/android/pylib/android_commands.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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 # pylint: disable-all
 
@@ skipping 1784 matching lines @@
       raise device_errors.AdbCommandFailedError(
           ['pull', device_file, host_file], 'Failed to pull file from device.')
     assert os.path.exists(host_file)
 
   def SetUtilWrapper(self, util_wrapper):
     """Sets a wrapper prefix to be used when running a locally-built
     binary on the device (ex.: md5sum_bin).
     """
     self._util_wrapper = util_wrapper
 
-  def RunInstrumentationTest(self, test, test_package, instr_args, timeout):
-    """Runs a single instrumentation test.
-
-    Args:
-      test: Test class/method.
-      test_package: Package name of test apk.
-      instr_args: Extra key/value to pass to am instrument.
-      timeout: Timeout time in seconds.
-
-    Returns:
-      An instance of am_instrument_parser.TestResult object.
-    """
-    instrumentation_path = ('%s/android.test.InstrumentationTestRunner' %
-                            test_package)
-    args_with_filter = dict(instr_args)
-    args_with_filter['class'] = test
-    logging.info(args_with_filter)
-    (raw_results, _) = self._adb.StartInstrumentation(
-        instrumentation_path=instrumentation_path,
-        instrumentation_args=args_with_filter,
-        timeout_time=timeout)
-    assert len(raw_results) == 1
-    return raw_results[0]
-
   def RunUIAutomatorTest(self, test, test_package, timeout):
     """Runs a single uiautomator test.
 
     Args:
       test: Test class/method.
       test_package: Name of the test jar.
       timeout: Timeout time in seconds.
 
     Returns:
       An instance of am_instrument_parser.TestResult object.
@@ skipping 137 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()