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

build/android/pylib/browsertests/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 logging
 import os
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
@@ skipping 21 matching lines @@
 
   test_suite_dir = os.path.join(cmd_helper.OutDirectory.get(),
                                 options.build_type)
   options.test_suite = os.path.join(test_suite_dir,
                                     'apks',
                                     constants.BROWSERTEST_SUITE_NAME + '.apk')
 
   options.test_arguments = '--single_process %s' % options.test_arguments
 
   # 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.BROWSERTEST_TEST_PACKAGE_NAME,
         constants.BROWSERTEST_TEST_ACTIVITY_NAME,
         constants.BROWSERTEST_COMMAND_LINE_FILE)
 
     # Get tests and split them up based on the number of devices.
   if options.gtest_filter:
     all_tests = [t for t in options.gtest_filter.split(':') if t]
   else:
     all_tests = gtest_dispatch.GetAllEnabledTests(RunnerFactory,
                                                   attached_devices)
 
   # Run tests.
   test_results = shard.ShardAndRunTests(RunnerFactory, attached_devices,
                                         all_tests, options.build_type)
   test_results.LogFull(
       test_type='Unit test',
       test_package=constants.BROWSERTEST_SUITE_NAME,
       build_type=options.build_type,
       flakiness_server=options.flakiness_dashboard_server)
   test_results.PrintAnnotation()