Moving ChildProcessConnectionTest from content to base.

Moving the classes related to ChildProcessConnection from content to
base now that ChildProcessConnection lives in base.

Bug: 702316
Change-Id: If79a101768ea72cc00732fbb81d579e9948358ba
Reviewed-on: https://chromium-review.googlesource.com/568759Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Bo Liu <boliu@chromium.org>
Commit-Queue: Jay Civelli <jcivelli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487174}

base/BUILD.gn

@@ -2728,6 +2728,15 @@ if (is_android) {
     ]
   }
 
+  android_library("base_java_process_launcher_test_support") {
+    testonly = true
+    deps = [
+      ":base_java",
+      ":base_java_test_support",
+    ]
+    java_files = [ "test/android/javatests/src/org/chromium/base/test/TestChildProcessConnection.java" ]
+  }
+
   junit_binary("base_junit_tests") {
     java_files = [
       "android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java",
@@ -2736,6 +2745,7 @@ if (is_android) {
       "android/junit/src/org/chromium/base/NonThreadSafeTest.java",
       "android/junit/src/org/chromium/base/PromiseTest.java",
       "android/junit/src/org/chromium/base/process_launcher/ChildConnectionAllocatorTest.java",
+      "android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java",
       "test/android/junit/src/org/chromium/base/test/SetUpStatementTest.java",
       "test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java",
       "test/android/junit/src/org/chromium/base/test/util/MinAndroidSdkLevelSkipCheckTest.java",
@@ -2744,6 +2754,7 @@ if (is_android) {
     ]
     deps = [
       ":base_java",
+      ":base_java_process_launcher_test_support",
       ":base_java_test_support",
     ]
     srcjar_deps = [ ":base_build_config_gen" ]

base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java

@@ -664,4 +664,9 @@ public class ChildProcessConnection {
     public boolean didOnServiceConnectedForTesting() {
         return mDidOnServiceConnected;
     }
+
+    @VisibleForTesting
+    protected Handler getLauncherHandler() {
+        return mLauncherHandler;
+    }
 }

content/public/android/junit/src/org/chromium/content/browser/ChildProcessConnectionTest.java → base/android/junit/src/org/chromium/base/process_launcher/ChildProcessConnectionTest.java

@@ -2,36 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.browser;
+package org.chromium.base.process_launcher;
 
 import android.content.ComponentName;
 
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
+import org.chromium.base.test.TestChildProcessConnection;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /** Unit tests for ChildProcessConnection. */
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class ChildProcessConnectionTest {
-    @Before
-    public void setUp() {
-        // The tests run on only one thread. Pretend that is the launcher thread so LauncherThread
-        // asserts are not triggered.
-        LauncherThread.setCurrentThreadAsLauncherThread();
-    }
-
-    @After
-    public void tearDown() {
-        LauncherThread.setLauncherThreadAsLauncherThread();
-    }
-
     private TestChildProcessConnection createTestConnection() {
         String packageName = "org.chromium.test";
         String serviceName = "TestService";

content/public/android/junit/src/org/chromium/content/browser/TestChildProcessConnection.java → base/test/android/javatests/src/org/chromium/base/test/TestChildProcessConnection.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.content.browser;
+package org.chromium.base.test;
 
 import android.content.ComponentName;
 import android.os.Bundle;
@@ -13,7 +13,7 @@ import org.chromium.base.process_launcher.ICallbackInt;
 import org.chromium.base.process_launcher.IChildProcessService;
 
 /** An implementation of ChildProcessConnection that does not connect to a real service. */
-class TestChildProcessConnection extends ChildProcessConnection {
+public class TestChildProcessConnection extends ChildProcessConnection {
     private static class MockServiceBinder extends IChildProcessService.Stub {
         @Override
         public boolean bindToCaller() {
@@ -41,7 +41,7 @@ class TestChildProcessConnection extends ChildProcessConnection {
         @Override
         public boolean bind() {
             if (TestChildProcessConnection.this.mPostOnServiceConnected) {
-                LauncherThread.post(new Runnable() {
+                getLauncherHandler().post(new Runnable() {
                     @Override
                     public void run() {
                         // TODO(boliu): implement a dummy service.
@@ -73,7 +73,7 @@ class TestChildProcessConnection extends ChildProcessConnection {
      * Creates a mock binding corresponding to real ManagedChildProcessConnection after the
      * connection is established: with initial binding bound and no strong binding.
      */
-    TestChildProcessConnection(ComponentName serviceName, boolean bindToCaller,
+    public TestChildProcessConnection(ComponentName serviceName, boolean bindToCaller,
             boolean bindAsExternalService, Bundle serviceBundle) {
         super(null /* context */, serviceName, bindToCaller, bindAsExternalService, serviceBundle);
         mPostOnServiceConnected = true;

content/public/android/BUILD.gn

@@ -470,10 +470,8 @@ android_library("content_javatests") {
 junit_binary("content_junit_tests") {
   java_files = [
     "junit/src/org/chromium/content/browser/BindingManagerImplTest.java",
-    "junit/src/org/chromium/content/browser/ChildProcessConnectionTest.java",
     "junit/src/org/chromium/content/browser/MenuDescriptorTest.java",
     "junit/src/org/chromium/content/browser/SpareChildConnectionTest.java",
-    "junit/src/org/chromium/content/browser/TestChildProcessConnection.java",
     "junit/src/org/chromium/content/browser/androidoverlay/DialogOverlayCoreTest.java",
     "junit/src/org/chromium/content/browser/input/RangeTest.java",
     "junit/src/org/chromium/content/browser/input/TextInputStateTest.java",
@@ -484,6 +482,7 @@ junit_binary("content_junit_tests") {
   deps = [
     ":content_java",
     "//base:base_java",
+    "//base:base_java_process_launcher_test_support",
     "//base:base_java_test_support",
     "//media/mojo/interfaces:interfaces_java",
     "//mojo/public/java:bindings_java",

content/public/android/junit/src/org/chromium/content/browser/BindingManagerImplTest.java

@@ -23,6 +23,7 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
 import org.chromium.base.process_launcher.ChildProcessConnection;
+import org.chromium.base.test.TestChildProcessConnection;
 import org.chromium.base.test.util.Feature;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 

content/public/android/junit/src/org/chromium/content/browser/SpareChildConnectionTest.java

@@ -27,6 +27,7 @@ import org.robolectric.shadows.ShadowLooper;
 
 import org.chromium.base.process_launcher.ChildConnectionAllocator;
 import org.chromium.base.process_launcher.ChildProcessConnection;
+import org.chromium.base.test.TestChildProcessConnection;
 import org.chromium.base.test.util.Feature;
 import org.chromium.testing.local.LocalRobolectricTestRunner;