4 files changed, 9 insertions, 9 deletions
diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py
index 35f1436..72874d4 100644
--- a/build/android/single_test_runner.py
+++ b/build/android/single_test_runner.py
@@ -76,12 +76,12 @@ class SingleTestRunner(BaseTestRunner):
   def _GetFilterFileName(self):
     """Returns the filename of gtest filter."""
     return os.path.join(sys.path[0], 'gtest_filter',
-        self.test_package.GetDisabledTestsBaseFileName() + '_disabled')
+        self.test_package.test_suite_basename + '_disabled')
 
   def _GetAdditionalEmulatorFilterName(self):
     """Returns the filename of additional gtest filter for emulator."""
     return os.path.join(sys.path[0], 'gtest_filter',
-        self.test_package.GetDisabledTestsBaseFileName() +
+        self.test_package.test_suite_basename +
         '_emulator_additional_disabled')
 
   def GetDisabledTests(self):
diff --git a/build/android/test_package.py b/build/android/test_package.py
index 8364c94..b460c91 100644
--- a/build/android/test_package.py
+++ b/build/android/test_package.py
@@ -37,7 +37,7 @@ class TestPackage(object):
     self.device = device
     self.test_suite_full = test_suite
     self.test_suite = os.path.splitext(test_suite)[0]
-    self.test_suite_basename = os.path.basename(self.test_suite)
+    self.test_suite_basename = self._GetTestSuiteBaseName()
     self.test_suite_dirname = os.path.dirname(self.test_suite)
     self.rebaseline = rebaseline
     self.performance_test = performance_test
diff --git a/build/android/test_package_apk.py b/build/android/test_package_apk.py
index 7def71a..e5d2151 100644
--- a/build/android/test_package_apk.py
+++ b/build/android/test_package_apk.py
@@ -89,7 +89,7 @@ class TestPackageApk(TestPackage):
                                timeout_time=60*5)
     logging.info('Install has completed.')
 
-  def GetDisabledTestsBaseFileName(self):
-    """Returns the  base filename of gtest filter."""
+  def _GetTestSuiteBaseName(self):
+    """Returns the  base name of the test suite."""
     # APK test suite names end with '-debug.apk'
-    return self.test_suite_basename.rsplit('-debug', 1)[0]
+    return os.path.basename(self.test_suite).rsplit('-debug', 1)[0]
diff --git a/build/android/test_package_executable.py b/build/android/test_package_executable.py
index 5a58526..8df609a 100644
--- a/build/android/test_package_executable.py
+++ b/build/android/test_package_executable.py
@@ -158,6 +158,6 @@ class TestPackageExecutable(TestPackage):
       self.adb.PushIfNeeded(self.test_suite_dirname + '/locales/en-US.pak',
                             '/data/local/tmp/paks/en-US.pak')
 
-  def GetDisabledTestsBaseFileName(self):
-    """Returns the base filename of gtest filter."""
-    return self.test_suite_basename
+  def _GetTestSuiteBaseName(self):
+    """Returns the  base name of the test suite."""
+    return os.path.basename(self.test_suite)