Making callbacks in Android ChildProcessLauncher generic.

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

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
index 2471005ad6d836c15646924ba4297e1d3f1bbe38..18d23502a0a52ec452a771497d482872eaf7e349 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java
@@ -22,11 +22,12 @@ import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 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 java.io.IOException;
 
+import javax.annotation.Nullable;
+
 /**
  * Manages a connection between the browser activity and a child service.
  */
@@ -90,11 +91,11 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
     private static class ConnectionParams {
         final String[] mCommandLine;
         final FileDescriptorInfo[] mFilesToBeMapped;
-        final IChildProcessCallback mCallback;
+        final IBinder mCallback;
         final Bundle mSharedRelros;
 
         ConnectionParams(String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
-                IChildProcessCallback callback, Bundle sharedRelros) {
+                IBinder callback, Bundle sharedRelros) {
             mCommandLine = commandLine;
             mFilesToBeMapped = filesToBeMapped;
             mCallback = callback;
@@ -350,11 +351,8 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
     }
 
     @Override
-    public void setupConnection(
-            String[] commandLine,
-            FileDescriptorInfo[] filesToBeMapped,
-            IChildProcessCallback processCallback,
-            ConnectionCallback connectionCallback,
+    public void setupConnection(String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
+            @Nullable IBinder callback, ConnectionCallback connectionCallback,
             Bundle sharedRelros) {
         synchronized (mLock) {
             assert mConnectionParams == null;
@@ -366,8 +364,8 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
             try {
                 TraceEvent.begin("ChildProcessConnectionImpl.setupConnection");
                 mConnectionCallback = connectionCallback;
-                mConnectionParams = new ConnectionParams(
-                        commandLine, filesToBeMapped, processCallback, sharedRelros);
+                mConnectionParams =
+                        new ConnectionParams(commandLine, filesToBeMapped, callback, sharedRelros);
                 // Run the setup if the service is already connected. If not,
                 // doConnectionSetupLocked() will be called from onServiceConnected().
                 if (mServiceConnectComplete) {