[Android] Redesigns the sharder to allow replicated vs distributed tests

build/android/pylib/host_driven/python_test_base.py

 # Copyright (c) 2012 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.
 
 """Base class for Android Python-driven tests.
 
 This test case is intended to serve as the base class for any Python-driven
 tests. It is similar to the Python unitttest module in that the user's tests
 inherit from this case and add their tests in that case.
 
@@ skipping 60 matching lines @@
       fname: filename for the test (e.g. foo/bar/baz/tests/FooTest.py)
       suite: name of the Java test suite (e.g. FooTest)
       test: name of the test method to run (e.g. testFooBar)
 
     Returns:
       TestRunResults object with a single test result.
     """
     test = self._ComposeFullTestName(fname, suite, test)
     test_pkg = test_package.TestPackage(
         self.options.test_apk_path, self.options.test_apk_jar_path)
-    java_test_runner = test_runner.TestRunner(self.options, self.device_id,
+    java_test_runner = test_runner.TestRunner(self.options.build_type,
+                                              self.options.test_data,
+                                              self.options.install_apk,
+                                              self.options.save_perf_json,
+                                              self.options.screenshot_failures,
+                                              self.options.tool,
+                                              self.options.wait_for_debugger,
+                                              self.options.disable_assertions,
+                                              self.options.push_deps,
+                                              self.options.cleanup_test_files,
+                                              self.device_id,
                                               self.shard_index, test_pkg,
                                               self.ports_to_forward)
     try:
       java_test_runner.SetUp()
       return java_test_runner.RunTest(test)[0]
     finally:
       java_test_runner.TearDown()
 
   def _RunJavaTests(self, fname, tests):
     """Calls a list of tests and stops at the first test failure.
@@ skipping 33 matching lines @@
 
   def _ComposeFullTestName(self, fname, suite, test):
     package_name = self._GetPackageName(fname)
     return package_name + '.' + suite + '#' + test
 
   def _GetPackageName(self, fname):
     """Extracts the package name from the test file path."""
     dirname = os.path.dirname(fname)
     package = dirname[dirname.rfind(BASE_ROOT) + len(BASE_ROOT):]
     return package.replace(os.sep, '.')