[Android] Switch gtests to platform mode. (RELAND)

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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 logging
 import os
 import re
 import sys
 import tempfile
 
 from devil.android import apk_helper
 from pylib import constants
 from pylib.base import base_test_result
 from pylib.base import test_instance
 
 sys.path.append(os.path.join(
     constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common'))
 import unittest_util # pylint: disable=import-error
 
 
 BROWSER_TEST_SUITES = [
   'components_browsertests',
   'content_browsertests',
 ]
 
+RUN_IN_SUB_THREAD_TEST_SUITES = ['net_unittests']
+
 
 _DEFAULT_ISOLATE_FILE_PATHS = {
     'base_unittests': 'base/base_unittests.isolate',
     'blink_heap_unittests':
       'third_party/WebKit/Source/platform/heap/BlinkHeapUnitTests.isolate',
     'breakpad_unittests': 'breakpad/breakpad_unittests.isolate',
     'cc_perftests': 'cc/cc_perftests.isolate',
     'components_browsertests': 'components/components_browsertests.isolate',
     'components_unittests': 'components/components_unittests.isolate',
     'content_browsertests': 'content/content_browsertests.isolate',
@@ skipping 30 matching lines @@
     'third_party/hunspell_dictionaries/*.dic',
     # crbug.com/258690
     'webkit/data/bmp_decoder',
     'webkit/data/ico_decoder',
 ]
 
 
 _EXTRA_NATIVE_TEST_ACTIVITY = (
     'org.chromium.native_test.NativeTestInstrumentationTestRunner.'
         'NativeTestActivity')
+_EXTRA_RUN_IN_SUB_THREAD = (
+    'org.chromium.native_test.NativeTestActivity.RunInSubThread')
 _EXTRA_SHARD_SIZE_LIMIT = (
     'org.chromium.native_test.NativeTestInstrumentationTestRunner.'
         'ShardSizeLimit')
 
 # TODO(jbudorick): Remove these once we're no longer parsing stdout to generate
 # results.
 _RE_TEST_STATUS = re.compile(
     r'\[ +((?:RUN)|(?:FAILED)|(?:OK)) +\] ?([^ ]+)(?: \((\d+) ms\))?$')
 _RE_TEST_RUN_STATUS = re.compile(
     r'\[ +(PASSED|RUNNER_FAILED|CRASHED) \] ?[^ ]+')
@@ skipping 55 matching lines @@
       self._runner = None
     else:
       helper = apk_helper.ApkHelper(self._apk_path)
       self._activity = helper.GetActivityName()
       self._package = helper.GetPackageName()
       self._runner = helper.GetInstrumentationName()
       self._permissions = helper.GetPermissions()
       self._extras = {
         _EXTRA_NATIVE_TEST_ACTIVITY: self._activity,
       }
+      if self._suite in RUN_IN_SUB_THREAD_TEST_SUITES:
+        self._extras[_EXTRA_RUN_IN_SUB_THREAD] = 1
       if self._suite in BROWSER_TEST_SUITES:
         self._extras[_EXTRA_SHARD_SIZE_LIMIT] = 1
 
     if not os.path.exists(self._exe_path):
       self._exe_path = None
     if not self._apk_path and not self._exe_path:
       error_func('Could not find apk or executable for %s' % self._suite)
 
     self._data_deps = []
     if args.test_filter:
@@ skipping 164 matching lines @@
     return self._permissions
 
   @property
   def runner(self):
     return self._runner
 
   @property
   def suite(self):
     return self._suite