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

build/android/pylib/gtest/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.
 
 import copy
 import fnmatch
 import logging
 import os
 
 from pylib import android_commands
@@ skipping 73 matching lines @@
     devices: list of devices.
 
   Returns:
     List of all enabled tests.
 
   Raises Exception if all devices failed.
   """
   for device in devices:
     try:
       logging.info('Obtaining tests from %s', device)
-      runner = runner_factory(device)
+      runner = runner_factory(device, 0)
       return GetTestsFromDevice(runner)
     except Exception as e:
       logging.warning('Failed obtaining tests from %s with exception: %s',
                       device, e)
   raise Exception('No device available to get the list of tests.')
 
 
 def _RunATestSuite(options, suite_name):
   """Run a single test suite.
 
@@ skipping 24 matching lines @@
   if not attached_devices:
     logging.critical('A device must be attached and online.')
     return 1
 
   # Reset the test port allocation. It's important to do it before starting
   # to dispatch any tests.
   if not ports.ResetTestServerPortAllocation():
     raise Exception('Failed to reset test server port.')
 
   # Constructs a new TestRunner with the current options.
-  def RunnerFactory(device):
+  def RunnerFactory(device, shard_index):
     return test_runner.TestRunner(
         device,
         options.test_suite,
         options.test_arguments,
         options.timeout,
         options.cleanup_test_files,
         options.tool,
         options.build_type,
         options.webkit,
         constants.GTEST_TEST_PACKAGE_NAME,
@@ skipping 58 matching lines @@
   failures = 0
   for suite_name, suite_path in all_test_suites:
     # Give each test suite its own copy of options.
     test_options = copy.deepcopy(options)
     test_options.test_suite = suite_path
     failures += _RunATestSuite(test_options, suite_name)
 
   if options.use_xvfb:
     framebuffer.Stop()
   return failures