Fix test filter filename for APK based tests.

build/android/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 logging
 import os
 import sys
 
 from base_test_runner import BaseTestRunner
 import debug_info
@@ skipping 57 matching lines @@
   def _TestSuiteRequiresMockTestServer(self):
     """Returns True if the test suite requires mock test server."""
     return False
   # TODO(yfriedman): Disabled because of flakiness.
   # (self.test_package.test_suite_basename == 'unit_tests' or
   #          self.test_package.test_suite_basename == 'net_unittests' or
   #          False)
 
   def _GetFilterFileName(self):
     """Returns the filename of gtest filter."""
-    filter_dir = os.path.join(sys.path[0], 'gtest_filter')
-    filter_name = self.test_package.test_suite_basename + '_disabled'
-    disabled_filter = os.path.join(filter_dir, filter_name)
-    return disabled_filter
+    return os.path.join(sys.path[0], 'gtest_filter',
+        self.test_package.GetDisabledTestsBaseFileName() + '_disabled')
 
   def _GetAdditionalEmulatorFilterName(self):
     """Returns the filename of additional gtest filter for emulator."""
-    filter_dir = os.path.join(sys.path[0], 'gtest_filter')
-    filter_name = '%s%s' % (self.test_package.test_suite_basename,
+    return os.path.join(sys.path[0], 'gtest_filter',
+        self.test_package.GetDisabledTestsBaseFileName() +
         '_emulator_additional_disabled')
-    disabled_filter = os.path.join(filter_dir, filter_name)
-    return disabled_filter
 
   def GetDisabledTests(self):
     """Returns a list of disabled tests.
 
     Returns:
       A list of disabled tests obtained from gtest_filter/test_suite_disabled.
     """
     disabled_tests = run_tests_helper.GetExpectations(self._GetFilterFileName())
     if self._running_on_emulator:
       # Append emulator's filter file.
@@ skipping 208 matching lines @@
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     self.test_package.tool.CleanUpEnvironment()
     if self.test_package.cleanup_test_files:
       self.adb.RemovePushedFiles()
     if self.dump_debug_info:
       self.dump_debug_info.StopRecordingLog()
     if self.test_package.performance_test:
       self.adb.TearDownPerformanceTest()
     super(SingleTestRunner, self).TearDown()