Enable APK based tests for all unittest bundles.

build/android/run_tests.py

 #!/usr/bin/env python
 # 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.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
    to be deployed to the device (in /data/local/tmp).
@@ skipping 58 matching lines @@
 _TEST_SUITES = ['base_unittests',
                 'content_unittests',
                 'gpu_unittests',
                 'ipc_tests',
                 'net_unittests',
                 'sql_unittests',
                 'sync_unit_tests',
                 'ui_unittests',
                ]
 
-# Test suites which are run as APK. This will be replaced by the default
-# list when we start building all suites as APK.
-_APK_TEST_SUITES = ['base_unittests',
-                    'content_unittests',
-                    'ipc_tests',
-                    'net_unittests',
-                   ]
-
 def FullyQualifiedTestSuites(apk):
   """Return a fully qualified list that represents all known suites.
 
   Args:
     apk: if True, use the apk-based test runner"""
   # If not specified, assume the test suites are in out/Release
   test_suite_dir = os.path.abspath(os.path.join(run_tests_helper.CHROME_DIR,
                                                 'out', 'Release'))
   if apk:
     # out/Release/$SUITE_apk/$SUITE-debug.apk
     suites = [os.path.join(test_suite_dir,
                            t + '_apk',
                            t + '-debug.apk')
-              for t in _APK_TEST_SUITES]
+              for t in _TEST_SUITES]
   else:
     suites = [os.path.join(test_suite_dir, t) for t in _TEST_SUITES]
   return suites
 
 
 class TimeProfile(object):
   """Class for simple profiling of action, with logging of cost."""
 
   def __init__(self, description):
     self._description = description
@@ skipping 363 matching lines @@
   # from all suites, but the buildbot associates the exit status only with the
   # most recent step).
   if options.annotate:
     return 0
   else:
     return failed_tests_count
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))