[Merge m58] android: Limit bindToCaller check to webview

content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
index bdc900d83453df658ce3a265ce6466b116f74d7d..2774635cbdc0091b7868af3d77a67d9626225b4a 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java
@@ -387,9 +387,11 @@ public class ChildProcessLauncherTest extends InstrumentationTestCase {
 
         // Launch a service from this process. Since slot 0 is already bound by the Helper, it
         // will fail to start and the ChildProcessLauncher will retry.
-        final ChildProcessConnection conn = ChildProcessLauncher.startForTesting(context,
-                sProcessWaitArguments, new FileDescriptorInfo[0],
-                getDefaultChildProcessCreationParams(context.getPackageName()));
+        final ChildProcessCreationParams creationParams = new ChildProcessCreationParams(
+                context.getPackageName(), false /* isExternalService */,
+                LibraryProcessType.PROCESS_CHILD, true /* bindToCallerCheck */);
+        final ChildProcessConnection conn = ChildProcessLauncher.startForTesting(
+                context, sProcessWaitArguments, new FileDescriptorInfo[0], creationParams);
 
         CriteriaHelper.pollInstrumentationThread(
                 new Criteria("Failed waiting for instrumentation-bound service") {
@@ -532,7 +534,7 @@ public class ChildProcessLauncherTest extends InstrumentationTestCase {
 
     private ChildProcessCreationParams getDefaultChildProcessCreationParams(String packageName) {
         return new ChildProcessCreationParams(packageName, false /* isExternalService */,
-                LibraryProcessType.PROCESS_CHILD);
+                LibraryProcessType.PROCESS_CHILD, false /* bindToCallerCheck */);
     }
 
     private void triggerConnectionSetup(ChildProcessConnectionImpl connection) {