Revert of [Android] Refactor the native test wrappers.

build/android/pylib/gtest/test_package_apk.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.
 
 """Defines TestPackageApk to help run APK-based native tests."""
 # pylint: disable=W0212
 
 import logging
 import os
 import shlex
@@ skipping 12 matching lines @@
 
 class TestPackageApk(TestPackage):
   """A helper class for running APK-based native tests."""
 
   def __init__(self, suite_name):
     """
     Args:
       suite_name: Name of the test suite (e.g. base_unittests).
     """
     TestPackage.__init__(self, suite_name)
-    self.suite_path = os.path.join(
-        constants.GetOutDirectory(), '%s_apk' % suite_name,
-        '%s-debug.apk' % suite_name)
     if suite_name == 'content_browsertests':
+      self.suite_path = os.path.join(
+          constants.GetOutDirectory(), 'apks', '%s.apk' % suite_name)
       self._package_info = constants.PACKAGE_INFO['content_browsertests']
     elif suite_name == 'components_browsertests':
+      self.suite_path = os.path.join(
+          constants.GetOutDirectory(), 'apks', '%s.apk' % suite_name)
       self._package_info = constants.PACKAGE_INFO['components_browsertests']
     else:
+      self.suite_path = os.path.join(
+          constants.GetOutDirectory(), '%s_apk' % suite_name,
+          '%s-debug.apk' % suite_name)
       self._package_info = constants.PACKAGE_INFO['gtest']
 
   def _CreateCommandLineFileOnDevice(self, device, options):
     device.WriteFile(self._package_info.cmdline_file,
                      self.suite_name + ' ' + options)
 
   def _GetFifo(self):
     # The test.fifo path is determined by:
     # testing/android/native_test/java/src/org/chromium/native_test/
     #     NativeTestActivity.java and
@@ skipping 83 matching lines @@
       self._StartActivity(device, force_stop=False)
     finally:
       self.tool.CleanUpEnvironment()
     logfile = android_commands.NewLineNormalizer(sys.stdout)
     return self._WatchFifo(device, timeout=10, logfile=logfile)
 
   #override
   def Install(self, device):
     self.tool.CopyFiles(device)
     device.Install(self.suite_path)