Remove --performance_test from Android gtest runner.

build/android/pylib/single_test_runner.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 glob
 import logging
 import os
 import sys
 
 import android_commands
@@ skipping 10 matching lines @@
 
 class SingleTestRunner(BaseTestRunner):
   """Single test suite attached to a single device.
 
   Args:
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     gtest_filter: A gtest_filter flag.
     test_arguments: Additional arguments to pass to the test binary.
     timeout: Timeout for each test.
-    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.
     shard_index: index number of the shard on which the test suite will run.
     dump_debug_info: Whether or not to dump debug information.
     build_type: 'Release' or 'Debug'.
     in_webkit_checkout: Whether the suite is being run from a WebKit checkout.
   """
 
   def __init__(self, device, test_suite, gtest_filter, test_arguments, timeout,
-               performance_test, cleanup_test_files, tool_name,
-               shard_index, dump_debug_info, fast_and_loose, build_type,
-               in_webkit_checkout):
+               cleanup_test_files, tool_name, shard_index, dump_debug_info,
+               fast_and_loose, build_type, in_webkit_checkout):
     BaseTestRunner.__init__(self, device, tool_name, shard_index, build_type)
     self._running_on_emulator = self.device.startswith('emulator')
     self._gtest_filter = gtest_filter
     self._test_arguments = test_arguments
     self.test_results = TestResults()
     if dump_debug_info:
       self.dump_debug_info = debug_info.GTestDebugInfo(
           self.adb, device,
           os.path.basename(test_suite), gtest_filter)
     else:
       self.dump_debug_info = None
     self.fast_and_loose = fast_and_loose
     self.in_webkit_checkout = in_webkit_checkout
 
     logging.warning('Test suite: ' + test_suite)
     if os.path.splitext(test_suite)[1] == '.apk':
       self.test_package = TestPackageApk(
           self.adb,
           device,
           test_suite,
           timeout,
-          performance_test,
           cleanup_test_files,
           self.tool,
           self.dump_debug_info)
     else:
       # Put a copy into the android out/target directory, to allow stack trace
       # generation.
       symbols_dir = os.path.join(constants.CHROME_DIR, 'out', build_type,
                                  'lib.target')
       self.test_package = TestPackageExecutable(
           self.adb,
           device,
           test_suite, timeout,
-          performance_test,
           cleanup_test_files,
           self.tool,
           self.dump_debug_info,
           symbols_dir)
-    self._performance_test_setup = None
-    if performance_test:
-      self._performance_test_setup = perf_tests_helper.PerfTestSetup(self.adb)
 
   def _TestSuiteRequiresMockTestServer(self):
     """Returns True if the test suite requires mock test server."""
     tests_require_net_test_server = ['unit_tests', 'net_unittests',
                                      'content_unittests']
     return (self.test_package.test_suite_basename in
             tests_require_net_test_server)
 
   def _GetFilterFileName(self):
     """Returns the filename of gtest filter."""
@@ skipping 179 matching lines @@
         failed_tests += [BaseTestResult(t, '')]
       self.test_results = TestResults.FromRun(
           failed=failed_tests, device_exception=self.device)
 
     return self.test_results
 
   def SetUp(self):
     """Sets up necessary test enviroment for the test suite."""
     super(SingleTestRunner, self).SetUp()
     self.adb.ClearApplicationState(constants.CHROME_PACKAGE)
-    if self._performance_test_setup:
-      self._performance_test_setup.SetUp()
     if self.dump_debug_info:
       self.dump_debug_info.StartRecordingLog(True)
     self.StripAndCopyFiles()
     self.LaunchHelperToolsForTestSuite()
     self.tool.SetupEnvironment()
 
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
-    if self._performance_test_setup:
-      self._performance_test_setup.TearDown()
     if self.dump_debug_info:
       self.dump_debug_info.ArchiveNewCrashFiles()
     super(SingleTestRunner, self).TearDown()