Making callbacks in Android ChildProcessLauncher generic.

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

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessConnection.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnection.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnection.java
index 7faea6de653d3a8fe6cac3306a82f9557f94ecba..901e780fbb36bd5561c1bcaa5a8d5c09a3d3033d 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnection.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnection.java
@@ -4,11 +4,14 @@
 
 package org.chromium.content.browser;
 
+import android.os.IBinder;
+
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.base.process_launcher.FileDescriptorInfo;
-import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.IChildProcessService;
 
+import javax.annotation.Nullable;
+
 /**
  * Manages a connection between the browser activity and a child service. ChildProcessConnection is
  * responsible for estabilishing the connection (start()), closing it (stop()) and manipulating the
@@ -82,12 +85,13 @@ public interface ChildProcessConnection {
      * Setups the connection after it was started with start().
      * @param commandLine (optional) will be ignored if the command line was already sent in start()
      * @param filesToBeMapped a list of file descriptors that should be registered
-     * @param processCallback used for status updates regarding this process connection
+     * @param callback optional client specified callbacks that the child can use to communicate
+     *                 with the parent process
      * @param connectionCallback will be called exactly once after the connection is set up or the
      *                           setup fails
      */
     void setupConnection(String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
-            IChildProcessCallback processCallback, ConnectionCallback connectionCallback);
+            @Nullable IBinder callback, ConnectionCallback connectionCallback);
 
     /**
      * Terminates the connection to IChildProcessService, closing all bindings. It is safe to call