[Merge m58] android: Limit bindToCaller check to webview

content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

 // Copyright 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.
 
 package org.chromium.content.browser;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
@@ skipping 158 matching lines @@
                 }
                 try {
                     TraceEvent.begin(
                             "ChildProcessConnectionImpl.ChildServiceConnection.onServiceConnected");
                     mDidOnServiceConnected = true;
                     mService = IChildProcessService.Stub.asInterface(service);
 
                     StartCallback startCallback = mStartCallback;
                     mStartCallback = null;
 
+                    final boolean bindCheck =
+                            mCreationParams != null && mCreationParams.getBindToCallerCheck();
                     boolean boundToUs = false;
                     try {
-                        boundToUs = mService.bindToCaller();
+                        boundToUs = bindCheck ? mService.bindToCaller() : true;
                     } catch (RemoteException ex) {
                         // Do not trigger the StartCallback here, since the service is already
                         // dead and the DeathCallback will run from onServiceDisconnected().
                         Log.e(TAG, "Failed to bind service to connection.", ex);
                         return;
                     }
 
                     if (startCallback != null) {
                         if (boundToUs) {
                             startCallback.onChildStarted();
@@ skipping 360 matching lines @@
             return true;
         }
         return false;
     }
 
     @VisibleForTesting
     public boolean isConnected() {
         return mService != null;
     }
 }