Relands test_runner.py, updates buildbot scripts

build/android/pylib/gtest/test_package_executable.py

Index: build/android/pylib/gtest/test_package_executable.py
diff --git a/build/android/pylib/gtest/test_package_executable.py b/build/android/pylib/gtest/test_package_executable.py
index 3e6f6211ed9b95df69782ff6ede0375fbc5fd280..10fdac856cea8ac39c33b4ee8a9306edc230c1c3 100644
--- a/build/android/pylib/gtest/test_package_executable.py
+++ b/build/android/pylib/gtest/test_package_executable.py
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+"""Defines TestPackageExecutable to help run stand-alone executables."""
 
 import logging
 import os
@@ -89,11 +90,11 @@ class TestPackageExecutable(TestPackage):
          self.test_suite_basename))
     return self._ParseGTestListTests(all_tests)
 
-  def CreateTestRunnerScript(self, gtest_filter, test_arguments):
+  def CreateTestRunnerScript(self, test_filter, test_arguments):
     """Creates a test runner script and pushes to the device.
 
     Args:
-      gtest_filter: A gtest_filter flag.
+      test_filter: A test_filter flag.
       test_arguments: Additional arguments to pass to the test binary.
     """
     tool_wrapper = self.tool.GetTestWrapper()
@@ -108,13 +109,13 @@ class TestPackageExecutable(TestPackage):
                           self._AddNativeCoverageExports(),
                           tool_wrapper, constants.TEST_EXECUTABLE_DIR,
                           self.test_suite_basename,
-                          gtest_filter, test_arguments,
+                          test_filter, test_arguments,
                           TestPackageExecutable._TEST_RUNNER_RET_VAL_FILE))
     sh_script_file.flush()
     cmd_helper.RunCmd(['chmod', '+x', sh_script_file.name])
     self.adb.PushIfNeeded(
-            sh_script_file.name,
-            constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh')
+        sh_script_file.name,
+        constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh')
     logging.info('Conents of the test runner script: ')
     for line in open(sh_script_file.name).readlines():
       logging.info('  ' + line.rstrip())