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

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 @@
       suite: name of the Java test suite (e.g. FooTest)
       test: name of the test method to run (e.g. testFooBar)
 
     Returns:
       TestResults object with a single test result.
     """
     test = self._ComposeFullTestName(fname, suite, test)
     apks = [apk_info.ApkInfo(self.options.test_apk_path,
             self.options.test_apk_jar_path)]
     java_test_runner = test_runner.TestRunner(self.options, self.device_id,
-                                              [test], False, self.shard_index,
-                                              apks, self.ports_to_forward)
-    return java_test_runner.Run()
+                                              self.shard_index, False, apks,
+                                              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.
 
     This method iterates until either it encounters a non-passing test or it
     exhausts the list of tests. Then it returns the appropriate Python result.
 
     Args:
       fname: filename for the Python test
       tests: a list of Java test names which will be run
@@ skipping 68 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, '.')