[Android] Switch instrumentation tests to the new shard/runner paradigm.

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 shard
 from pylib.base import test_result
 
 import apk_info
-import test_sharder
+import test_runner
 
 
 def Dispatch(options, apks):
   """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.
@@ skipping 39 matching lines @@
   tests = []
   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 Java tests to run with current args.')
+    logging.warning('No instrumentation tests to run with current args.')
     return test_result.TestResults()
 
   tests *= options.number_of_runs
 
   attached_devices = android_commands.GetAttachedDevices()
-  test_results = test_result.TestResults()
 
   if not attached_devices:
-    raise Exception('You have no devices attached or visible!')
+    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]
-  sharder = test_sharder.TestSharder(attached_devices, options, tests, apks)
-  test_results = sharder.RunShardedTests()
-  return test_results
+
+  def TestRunnerFactory(device, shard_index):
+    return test_runner.TestRunner(options, device, shard_index, False, apks, [])
+
+  return shard.ShardAndRunTests(TestRunnerFactory, attached_devices, tests,
+                                options.build_type)