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 5e786a6c7302c2b6817d832a0d04589f96f87542..ccf19dd978f049bcc5e2db344d4a0054918a1fe3 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
@@ -5,12 +5,14 @@
 package org.chromium.content.browser;
 
 import android.os.Bundle;
+import android.os.IBinder;
 
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.content.common.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
@@ -84,16 +86,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,
-            Bundle sharedRelros);
+    void setupConnection(String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
+            @Nullable IBinder callback, ConnectionCallback connectionCallback, Bundle sharedRelros);
 
     /**
      * Terminates the connection to IChildProcessService, closing all bindings. It is safe to call