Clean up Android gtest runners.

build/android/pylib/test_package_apk.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.
 
 
 import os
 import shlex
 import sys
 import tempfile
 import time
 
 import android_commands
 import constants
 from android_commands import errors
 from test_package import TestPackage
 from pylib import pexpect
 
 class TestPackageApk(TestPackage):
   """A helper class for running APK-based native tests.
 
   Args:
     adb: ADB interface the tests are using.
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     timeout: Timeout for each test.
-    rebaseline: Whether or not to run tests in isolation and update the filter.
     performance_test: Whether or not performance test(s).
     cleanup_test_files: Whether or not to cleanup test files on device.
     tool: Name of the Valgrind tool.
     dump_debug_info: A debug_info object.
   """
 
-  def __init__(self, adb, device, test_suite, timeout, rebaseline,
+  def __init__(self, adb, device, test_suite, timeout,
                performance_test, cleanup_test_files, tool,
                dump_debug_info):
     TestPackage.__init__(self, adb, device, test_suite, timeout,
-                         rebaseline, performance_test, cleanup_test_files,
+                         performance_test, cleanup_test_files,
                          tool, dump_debug_info)
 
   def _CreateTestRunnerScript(self, options):
     command_line_file = tempfile.NamedTemporaryFile()
     # GTest expects argv[0] to be the executable path.
     command_line_file.write(self.test_suite_basename + ' ' + options)
     command_line_file.flush()
     self.adb.PushIfNeeded(command_line_file.name,
                           constants.TEST_EXECUTABLE_DIR +
                           '/chrome-native-tests-command-line')
@@ skipping 67 matching lines @@
     self.tool.CopyFiles()
     # Always uninstall the previous one (by activity name); we don't
     # know what was embedded in it.
     self.adb.ManagedInstall(self.test_suite_full, False,
                             package_name='org.chromium.native_test')
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""
     # APK test suite names end with '-debug.apk'
     return os.path.basename(self.test_suite).rsplit('-debug', 1)[0]