[Android] Rewrite base test result classes.

build/android/pylib/instrumentation/dispatch.py

 # Copyright (c) 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.
 
 """Dispatches the instrumentation tests."""
 
 import logging
 import os
 
 from pylib import android_commands
+from pylib.base import base_test_result
 from pylib.base import shard
-from pylib.base import test_result
 from pylib.uiautomator import test_package as uiautomator_package
 
 import test_package
 import test_runner
 
 
 def Dispatch(options):
   """Dispatches instrumentation tests onto connected device(s).
 
   If possible, this method will attempt to shard the tests to
   all connected devices. Otherwise, dispatch and run tests on one device.
 
   Args:
     options: Command line options.
 
   Returns:
-    A TestResults object holding the results of the Java tests.
+    A TestRunResults object holding the results of the Java tests.
 
   Raises:
     Exception: when there are no attached devices.
   """
   is_uiautomator_test = False
   if hasattr(options, 'uiautomator_jar'):
     test_pkg = uiautomator_package.TestPackage(
         options.uiautomator_jar, options.uiautomator_info_jar)
     is_uiautomator_test = True
   else:
@@ skipping 33 matching lines @@
   if options.test_filter:
     # |available_tests| are in adb instrument format: package.path.class#test.
     filter_without_hash = options.test_filter.replace('#', '.')
     tests = [t for t in available_tests
              if filter_without_hash in t.replace('#', '.')]
   else:
     tests = available_tests
 
   if not tests:
     logging.warning('No instrumentation tests to run with current args.')
-    return test_result.TestResults()
+    return base_test_result.TestRunResults()
 
   tests *= options.number_of_runs
 
   attached_devices = android_commands.GetAttachedDevices()
 
   if not attached_devices:
     raise Exception('There are no devices online.')
   if options.device:
     attached_devices = [options.device]
 
   logging.info('Will run: %s', str(tests))
 
   if len(attached_devices) > 1 and (coverage or options.wait_for_debugger):
     logging.warning('Coverage / debugger can not be sharded, '
                     'using first available device')
     attached_devices = attached_devices[:1]
 
   def TestRunnerFactory(device, shard_index):
     return test_runner.TestRunner(
         options, device, shard_index, False, test_pkg, [], is_uiautomator_test)
 
   return shard.ShardAndRunTests(TestRunnerFactory, attached_devices, tests,
                                 options.build_type)