Revert of [Android] Refactor the native test wrappers.

build/android/pylib/gtest/gtest_test_instance.py

Index: build/android/pylib/gtest/gtest_test_instance.py
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
index cea50160f51d9b086441a1297dc52b7740d464b6..b6f83b31b2e97637c55036da84b6c9b28f6f5d28 100644
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ b/build/android/pylib/gtest/gtest_test_instance.py
@@ -15,12 +15,6 @@
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common'))
 import unittest_util
-
-
-BROWSER_TEST_SUITES = [
-  'components_browsertests',
-  'content_browsertests',
-]
 
 
 # Used for filtering large data deps at a finer grain than what's allowed in
@@ -98,9 +92,16 @@
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._suite = args.suite_name[0]
 
-    self._apk_path = os.path.join(
-        constants.GetOutDirectory(), '%s_apk' % self._suite,
-        '%s-debug.apk' % self._suite)
+    if (self._suite == 'content_browsertests' or
+        self._suite == 'components_browsertests'):
+      error_func('%s are not currently supported '
+                 'in platform mode.' % self._suite)
+      self._apk_path = os.path.join(
+          constants.GetOutDirectory(), 'apks', '%s.apk' % self._suite)
+    else:
+      self._apk_path = os.path.join(
+          constants.GetOutDirectory(), '%s_apk' % self._suite,
+          '%s-debug.apk' % self._suite)
     self._exe_path = os.path.join(constants.GetOutDirectory(),
                                   self._suite)
     if not os.path.exists(self._apk_path):