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

base/test/BUILD.gn

 # 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("//build/config/ui.gni")
 import("//build/config/nacl/config.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 static_library("test_config") {
   testonly = true
   sources = [
     "test_switches.cc",
     "test_switches.h",
     "test_timeouts.cc",
     "test_timeouts.h",
   ]
   deps = [
     "//base",
   ]
 }
 
-if (is_android) {
-  # This target is needed for components on Android depending on
-  # base:test_support that do not define a main function. This is because
-  # multiprocess support on Android requires a main function (the one invoked on
-  # the child process).
-  static_library("test_support_main_stub") {
-    testonly = true
-    if (is_component_build) {
-      sources = [
-        "main_stub.cc",
-      ]
-      deps = [
-        "//base",
-      ]
-    }
-  }
-}
-
 static_library("test_support") {
   testonly = true
   sources = [
     "../trace_event/trace_config_memory_test_util.h",
     "android/java_handler_thread_for_testing.cc",
     "android/java_handler_thread_for_testing.h",
-    "android/multiprocess_test_client_service.cc",
-    "android/test_support_jni_registrar.cc",
-    "android/test_support_jni_registrar.h",
     "android/test_system_message_handler_link_android.cc",
     "android/test_system_message_handler_link_android.h",
     "fuzzed_data_provider.cc",
     "fuzzed_data_provider.h",
     "gtest_util.cc",
     "gtest_util.h",
     "gtest_xml_unittest_result_printer.cc",
     "gtest_xml_unittest_result_printer.h",
     "gtest_xml_util.cc",
     "gtest_xml_util.h",
     "histogram_tester.cc",
     "histogram_tester.h",
     "icu_test_util.cc",
     "icu_test_util.h",
     "ios/wait_util.h",
     "ios/wait_util.mm",
     "launcher/test_result.cc",
     "launcher/test_result.h",
     "launcher/test_results_tracker.h",
     "launcher/unit_test_launcher.h",
     "mock_chrome_application_mac.h",
     "mock_chrome_application_mac.mm",
     "mock_devices_changed_observer.cc",
     "mock_devices_changed_observer.h",
     "mock_entropy_provider.cc",
     "mock_entropy_provider.h",
     "mock_log.cc",
     "mock_log.h",
-    "multiprocess_test.cc",
     "multiprocess_test.h",
-    "multiprocess_test_android.cc",
     "null_task_runner.cc",
     "null_task_runner.h",
     "opaque_ref_counted.cc",
     "opaque_ref_counted.h",
     "perf_log.cc",
     "perf_log.h",
     "perf_test_suite.cc",
     "perf_test_suite.h",
     "perf_time_logger.cc",
     "perf_time_logger.h",
@@ skipping 69 matching lines @@
   if (is_ios) {
     sources += [ "launcher/unit_test_launcher_ios.cc" ]
   } else if (!is_nacl_nonsfi) {
     sources += [
       "launcher/test_launcher.cc",
       "launcher/test_launcher.h",
       "launcher/test_launcher_tracer.cc",
       "launcher/test_launcher_tracer.h",
       "launcher/test_results_tracker.cc",
       "launcher/unit_test_launcher.cc",
+      "multiprocess_test.cc",
+      "multiprocess_test_android.cc",
     ]
   }
 
   configs += [ "//build/config:precompiled_headers" ]
 
   data = [
     # The isolate needs this script for setting up the test. It's not actually
     # needed to run this target locally.
     "//testing/test_env.py",
   ]
@@ skipping 23 matching lines @@
     set_sources_assignment_filter([])
     sources += [ "test_file_util_mac.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
   if (is_mac) {
     libs = [ "AppKit.framework" ]
   }
 
   if (is_android) {
-    deps += [
-      ":base_unittests_jni_headers",
-      ":test_support_jni_headers",
-    ]
-    public_deps += [ ":test_support_java" ]
+    deps += [ ":base_unittests_jni_headers" ]
   }
 
   if (is_nacl_nonsfi) {
     sources += [
       "launcher/test_launcher.h",
       "launcher/test_result.h",
       "launcher/unit_test_launcher.h",
       "launcher/unit_test_launcher_nacl_nonsfi.cc",
     ]
     sources -= [
@@ skipping 115 matching lines @@
 
 if (is_android) {
   generate_jni("base_unittests_jni_headers") {
     sources = [
       "android/java/src/org/chromium/base/ContentUriTestUtils.java",
       "android/java/src/org/chromium/base/TestSystemMessageHandler.java",
       "android/java/src/org/chromium/base/TestUiThread.java",
     ]
     jni_package = "base"
   }
-
-  generate_jni("test_support_jni_headers") {
-    sources = [
-      "android/java/src/org/chromium/base/MainReturnCodeResult.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientService.java",
-    ]
-    jni_package = "base"
-  }
-
-  android_library("test_support_java") {
-    testonly = true
-    deps = [
-      "//base:base_java",
-      "//third_party/android_tools:android_support_annotations_java",
-      "//third_party/jsr-305:jsr_305_javalib",
-    ]
-    srcjar_deps = [ ":test_support_java_aidl" ]
-    java_files = [
-      "android/java/src/org/chromium/base/FileDescriptorInfo.java",
-      "android/java/src/org/chromium/base/MainReturnCodeResult.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientLauncher.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientService.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientService0.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientService1.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientService2.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientService3.java",
-      "android/java/src/org/chromium/base/MultiprocessTestClientService4.java",
-    ]
-  }
-
-  android_aidl("test_support_java_aidl") {
-    testonly = true
-    import_include = "android/java/src"
-    sources = [
-      "android/java/src/org/chromium/base/ITestClient.aidl",
-    ]
-  }
 }