Revert of [Android] Remove old gtest test_runner code.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 import collections
 import glob
 import hashlib
 import json
 import os
 import random
 import re
 import shutil
 import sys
 
 import bb_utils
 import bb_annotations
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 import provision_devices
 from devil.android import device_utils
 from pylib import constants
+from pylib.gtest import gtest_config
 
 CHROME_SRC_DIR = bb_utils.CHROME_SRC
 DIR_BUILD_ROOT = os.path.dirname(CHROME_SRC_DIR)
 CHROME_OUT_DIR = bb_utils.CHROME_OUT_DIR
 BLINK_SCRIPTS_DIR = 'third_party/WebKit/Tools/Scripts'
 
 SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave')
 LOGCAT_DIR = os.path.join(bb_utils.CHROME_OUT_DIR, 'logcat')
 GS_URL = 'https://storage.googleapis.com'
 GS_AUTH_URL = 'https://storage.cloud.google.com'
 
-# gtest suite groups.
-ASAN_EXCLUDED_GTEST_SUITES = [
-    'breakpad_unittests',
-    'sandbox_linux_unittests'
-]
-
-EXPERIMENTAL_GTEST_SUITES = [
-    'components_browsertests',
-    'content_gl_tests',
-    'heap_profiler_unittests',
-    'devtools_bridge_tests',
-]
-
-STABLE_GTEST_SUITES = [
-    'android_webview_unittests',
-    'base_unittests',
-    'breakpad_unittests',
-    'cc_unittests',
-    'components_unittests',
-    'content_browsertests',
-    'content_unittests',
-    'events_unittests',
-    'gl_tests',
-    'gl_unittests',
-    'gpu_unittests',
-    'ipc_tests',
-    'media_unittests',
-    'midi_unittests',
-    'net_unittests',
-    'sandbox_linux_unittests',
-    'skia_unittests',
-    'sql_unittests',
-    'sync_unit_tests',
-    'ui_android_unittests',
-    'ui_base_unittests',
-    'ui_touch_selection_unittests',
-    'unit_tests',
-    'webkit_unit_tests',
-]
-
 # Describes an instrumation test suite:
 #   test: Name of test we're running.
 #   apk: apk to be installed.
 #   apk_package: package for the apk to be installed.
 #   test_apk: apk to run tests on.
 #   test_data: data folder in format destination:source.
 #   host_driven_root: The host-driven test root directory.
 #   annotation: Annotation of the tests to include.
 #   exclude_annotation: The annotation of the tests to exclude.
 I_TEST = collections.namedtuple('InstrumentationTest', [
     'name', 'apk', 'apk_package', 'test_apk', 'test_data', 'isolate_file_path',
     'host_driven_root', 'annotation', 'exclude_annotation', 'extra_flags'])
 
 
 def SrcPath(*path):
   return os.path.join(CHROME_SRC_DIR, *path)
 
+
 def I(name, apk, apk_package, test_apk, test_data, isolate_file_path=None,
       host_driven_root=None, annotation=None, exclude_annotation=None,
       extra_flags=None):
   return I_TEST(name, apk, apk_package, test_apk, test_data, isolate_file_path,
                 host_driven_root, annotation, exclude_annotation, extra_flags)
 
 INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
     I('ContentShell',
       'ContentShell.apk',
       'org.chromium.content_shell_apk',
@@ skipping 409 matching lines @@
 
 
 def GetDeviceSetupStepCmds():
   return [
       ('device_status_check', DeviceStatusCheck),
       ('provision_devices', ProvisionDevices),
   ]
 
 
 def RunUnitTests(options):
-  suites = STABLE_GTEST_SUITES
+  suites = gtest_config.STABLE_TEST_SUITES
   if options.asan:
     suites = [s for s in suites
-              if s not in ASAN_EXCLUDED_GTEST_SUITES]
+              if s not in gtest_config.ASAN_EXCLUDED_TEST_SUITES]
   RunTestSuites(options, suites)
 
 
 def RunInstrumentationTests(options):
   for test in INSTRUMENTATION_TESTS.itervalues():
     RunInstrumentationSuite(options, test)
 
 
 def RunWebkitTests(options):
   RunTestSuites(options, ['webkit_unit_tests', 'blink_heap_unittests'])
@@ skipping 169 matching lines @@
     if options.test_filter:
       bb_utils.RunSteps(options.test_filter, GetTestStepCmds(), options)
 
     if options.coverage_bucket:
       coverage_html = GenerateJavaCoverageReport(options)
       UploadHTML(options, '%s/java' % options.coverage_bucket, coverage_html,
                  'Coverage Report')
       shutil.rmtree(coverage_html, ignore_errors=True)
 
     if options.experimental:
-      RunTestSuites(options, EXPERIMENTAL_GTEST_SUITES)
+      RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
 
   finally:
     # Run all post test steps
     LogcatDump(options)
     if not options.disable_stack_tool:
       RunStackToolSteps(options)
     GenerateTestReport(options)
     # KillHostHeartbeat() has logic to check if heartbeat process is running,
     # and kills only if it finds the process is running on the host.
     provision_devices.KillHostHeartbeat()
@@ skipping 74 matching lines @@
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))