Revert of [Android] Refactor the native test wrappers.

build/android/pylib/gtest/setup.py

 # Copyright 2013 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.
 
 """Generates test runner factory and tests for GTests."""
 # pylint: disable=W0212
 
 import logging
 import os
 import sys
 
 from pylib import constants
 
 from pylib.base import base_setup
 from pylib.base import base_test_result
 from pylib.base import test_dispatcher
 from pylib.device import device_utils
-from pylib.gtest import gtest_test_instance
 from pylib.gtest import test_package_apk
 from pylib.gtest import test_package_exe
 from pylib.gtest import test_runner
 
 sys.path.insert(0,
                 os.path.join(constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib',
                              'common'))
 import unittest_util # pylint: disable=F0401
 
 
@@ skipping 205 matching lines @@
     test_options = test_options._replace(
         test_arguments=('%s --gtest_also_run_disabled_tests' %
                         test_options.test_arguments))
   else:
     tests = _FilterDisabledTests(tests, test_options.suite_name,
                                  bool(test_options.gtest_filter))
   if test_options.gtest_filter:
     tests = unittest_util.FilterTestNames(tests, test_options.gtest_filter)
 
   # Coalesce unit tests into a single test per device
-  if test_options.suite_name not in gtest_test_instance.BROWSER_TEST_SUITES:
+  if (test_options.suite_name != 'content_browsertests' and
+      test_options.suite_name != 'components_browsertests'):
     num_devices = len(devices)
     tests = [':'.join(tests[i::num_devices]) for i in xrange(num_devices)]
     tests = [t for t in tests if t]
 
   return (TestRunnerFactory, tests)