Making callbacks in Android ChildProcessLauncher generic.

content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java

Index: content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java
diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java
index b534242265adaec2f41040668aab7e6919359419..4737c86d070e87c82c0df73b7162c84c6acab6c7 100644
--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java
+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java
@@ -34,8 +34,8 @@ import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.content.browser.ChildProcessConstants;
 import org.chromium.content.common.ContentSwitches;
 import org.chromium.content.common.FileDescriptorInfo;
-import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.IChildProcessService;
+import org.chromium.content.common.IContentChildProcessCallback;
 import org.chromium.content.common.SurfaceWrapper;
 
 import java.util.concurrent.Semaphore;
@@ -58,7 +58,7 @@ public class ChildProcessServiceImpl {
 
     // Lock that protects the following members.
     private final Object mBinderLock = new Object();
-    private IChildProcessCallback mCallback;
+    private IContentChildProcessCallback mCallback;
     // PID of the client of this service, set in bindToCaller().
     private int mBoundCallingPid;
 
@@ -124,7 +124,7 @@ public class ChildProcessServiceImpl {
         }
 
         @Override
-        public int setupConnection(Bundle args, IChildProcessCallback callback) {
+        public int setupConnection(Bundle args, IBinder callback) {
             int callingPid = Binder.getCallingPid();
             synchronized (mBinderLock) {
                 if (mBoundCallingPid != callingPid) {
@@ -137,7 +137,9 @@ public class ChildProcessServiceImpl {
                     return -1;
                 }
 
-                mCallback = callback;
+                mCallback = callback != null
+                        ? IContentChildProcessCallback.Stub.asInterface(callback)
+                        : null;
                 getServiceInfo(args);
                 return Process.myPid();
             }