Revert of Multiprocess test client: Android child process launcher rework.

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 HTMLParser
 import logging
 import os
 import re
 import tempfile
 import threading
 import xml.etree.ElementTree
 
 from devil.android import apk_helper
 from pylib import constants
 from pylib.constants import host_paths
 from pylib.base import base_test_result
 from pylib.base import test_instance
 
 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
   import unittest_util # pylint: disable=import-error
 
 
 BROWSER_TEST_SUITES = [
   'components_browsertests',
   'content_browsertests',
 ]
 
-RUN_IN_SUB_THREAD_TEST_SUITES = [
-  # Multiprocess tests should be run outside of the main thread.
-  'base_unittests',  # file_locking_unittest.cc uses a child process.
-  'ipc_perftests',
-  'ipc_tests',
-  'mojo_message_pipe_perftests',
-  'mojo_public_bindings_perftests',
-  'mojo_system_unittests',
-  'net_unittests'
-]
+RUN_IN_SUB_THREAD_TEST_SUITES = ['net_unittests']
 
 
 # Used for filtering large data deps at a finer grain than what's allowed in
 # isolate files since pushing deps to devices is expensive.
 # Wildcards are allowed.
 _DEPS_EXCLUSION_LIST = [
     'chrome/test/data/extensions/api_test',
     'chrome/test/data/extensions/secure_shell',
     'chrome/test/data/firefox*',
     'chrome/test/data/gpu',
@@ skipping 437 matching lines @@
             '%s' % l for l in (line.strip() for line in disabled_tests_file)
             if l and not l.startswith('#')]
 
     return '*-%s' % ':'.join(disabled_filter_items)
 
   #override
   def TearDown(self):
     """Do nothing."""
     pass