[Merge m58] android: Limit bindToCaller check to webview

content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java

 // Copyright 2017 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.
 
 package org.chromium.content_shell_apk;
 
 import android.app.Service;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ skipping 50 matching lines @@
 
     @Override
     public IBinder onBind(Intent intent) {
         Messenger messenger =
                 new Messenger(new Handler(mHandlerThread.getLooper(), mHandlerCallback));
         return messenger.getBinder();
     }
 
     private void doBindService(final Message msg) {
         String[] commandLine = { "_", "--" + BaseSwitches.RENDERER_WAIT_FOR_JAVA_DEBUGGER };
-        ChildProcessCreationParams params = new ChildProcessCreationParams(getPackageName(), false,
-                LibraryProcessType.PROCESS_CHILD);
+        final boolean bindToCaller = true;
+        ChildProcessCreationParams params = new ChildProcessCreationParams(
+                getPackageName(), false, LibraryProcessType.PROCESS_CHILD, bindToCaller);
         final ChildProcessConnection conn = ChildProcessLauncher.startForTesting(this, commandLine,
                 new FileDescriptorInfo[0], params);
 
         // Poll the connection until it is set up. The main test in ChildProcessLauncherTest, which
         // has bound the connection to this service, manages the timeout via the lifetime of this
         // service.
         final Handler handler = new Handler();
         final Runnable task = new Runnable() {
             final Messenger mReplyTo = msg.replyTo;
 
             @Override
             public void run() {
                 if (conn.getPid() != 0) {
                     try {
                         mReplyTo.send(Message.obtain(null, MSG_BIND_SERVICE_REPLY, conn.getPid(),
                                     conn.getServiceNumber()));
                     } catch (RemoteException ex) {
                         throw new RuntimeException(ex);
                     }
                 } else {
                     handler.postDelayed(this, 10 /* milliseconds */);
                 }
             }
         };
         handler.postDelayed(task, 10);
     }
 }