[Android] Clean up gtest filtering logic.

build/android/pylib/gtest/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 logging
 import os
 import re
 
 from pylib import android_commands
 from pylib import constants
@@ skipping 31 matching lines @@
       tool_name: Name of the Valgrind tool.
       build_type: 'Release' or 'Debug'.
       in_webkit_checkout: Whether the suite is being run from a WebKit checkout.
       push_deps: If True, push all dependencies to the device.
       test_apk_package_name: Apk package name for tests running in APKs.
       test_activity_name: Test activity to invoke for APK tests.
       command_line_file: Filename to use to pass arguments to tests.
     """
     super(TestRunner, self).__init__(device, tool_name, build_type, push_deps,
                                      cleanup_test_files)
-    self._running_on_emulator = self.device.startswith('emulator')
     self._test_arguments = test_arguments
     self.in_webkit_checkout = in_webkit_checkout
     if timeout == 0:
       timeout = 60
     # On a VM (e.g. chromium buildbots), this timeout is way too small.
     if os.environ.get('BUILDBOT_SLAVENAME'):
       timeout = timeout * 2
     self.timeout = timeout * self.tool.GetTimeoutScale()
 
     logging.warning('Test suite: ' + test_suite)
@@ skipping 56 matching lines @@
         os.path.join(webkit_src, 'Source/WebKit/chromium/tests/data'),
         os.path.join(
             self.adb.GetExternalStorage(),
             'third_party/WebKit/Source/WebKit/chromium/tests/data'))
     self.adb.PushIfNeeded(
         os.path.join(constants.DIR_SOURCE_ROOT,
                      'third_party/hyphen/hyph_en_US.dic'),
         os.path.join(self.adb.GetExternalStorage(),
                      'third_party/hyphen/hyph_en_US.dic'))
 
-  # TODO(craigdh): There is no reason for this to be part of TestRunner.
-  def GetDisabledTests(self):
-    """Returns a list of disabled tests.
-
-    Returns:
-      A list of disabled tests obtained from 'filter' subdirectory.
-    """
-    gtest_filter_base_path = os.path.join(
-        os.path.abspath(os.path.dirname(__file__)),
-        'filter',
-        self.test_package.test_suite_basename)
-    disabled_tests = run_tests_helper.GetExpectations(
-       gtest_filter_base_path + '_disabled')
-    if self._running_on_emulator:
-      # Append emulator's filter file.
-      disabled_tests.extend(run_tests_helper.GetExpectations(
-          gtest_filter_base_path + '_emulator_additional_disabled'))
-    return disabled_tests
-
   def _ParseTestOutput(self, p):
     """Process the test output.
 
     Args:
       p: An instance of pexpect spawn class.
 
     Returns:
       A TestRunResults object.
     """
     results = base_test_result.TestRunResults()
@@ skipping 95 matching lines @@
     super(TestRunner, self).SetUp()
     if _TestSuiteRequiresMockTestServer(self.test_package.test_suite_basename):
       self.LaunchChromeTestServerSpawner()
     self.tool.SetupEnvironment()
 
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()