Makes host driven tests use the common sharder.

build/android/pylib/instrumentation/dispatch.py

Index: build/android/pylib/instrumentation/dispatch.py
diff --git a/build/android/pylib/instrumentation/dispatch.py b/build/android/pylib/instrumentation/dispatch.py
index e4ca2805243c6edb7f02830ae28bd808256ef6df..55b4b93033968f97480d27388fa58b2549c460e6 100644
--- a/build/android/pylib/instrumentation/dispatch.py
+++ b/build/android/pylib/instrumentation/dispatch.py
@@ -2,13 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Dispatches the instrumentation tests."""
+"""Runs the instrumentation tests."""
 
 import logging
 import os
 
 from pylib import android_commands
 from pylib import constants
+from pylib import dispatch
 from pylib.base import base_test_result
 from pylib.base import shard
 from pylib.utils import report_results
@@ -17,8 +18,8 @@ import test_package
 import test_runner
 
 
-def Dispatch(options):
-  """Dispatches instrumentation tests onto connected device(s).
+def RunInstrumentationTests(options):
+  """Runs instrumentation tests on 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.
@@ -40,23 +41,10 @@ def Dispatch(options):
     logging.error('No instrumentation tests to run with current args.')
     return (base_test_result.TestRunResults(), constants.ERROR_EXIT_CODE)
 
-  attached_devices = android_commands.GetAttachedDevices()
-  if not attached_devices:
-    raise Exception('There are no devices online.')
-
-  if options.test_device:
-    assert options.test_device in attached_devices
-    attached_devices = [options.test_device]
-
-  if len(attached_devices) > 1 and options.wait_for_debugger:
-    logging.warning('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, test_pkg, [])
 
-  return shard.ShardAndRunTests(TestRunnerFactory, attached_devices, tests,
-                                options.build_type,
-                                test_timeout=None,
-                                num_retries=options.num_retries)
+  return dispatch.Dispatch(options, tests, TestRunnerFactory,
+                           distribution='shard')