Making callbacks in Android ChildProcessLauncher generic.

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

 // Copyright 2012 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.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
  * bindings held onto the service (addStrongBinding(), removeStrongBinding(),
  * removeInitialBinding()).
  */
 public interface ChildProcessConnection {
     /**
      * Used to notify the consumer about disconnection of the service. This callback is provided
      * earlier than ConnectionCallbacks below, as a child process might die before the connection is
@@ skipping 53 matching lines @@
      * separate to allow to pass whatever parameters are available in start(), and complete the
      * remainder later while reducing the connection setup latency.
      * @param startCallback (optional) callback when the child process starts or fails to start.
      */
     void start(StartCallback startCallback);
 
     /**
      * 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
      * this multiple times.
      */
     void stop();
 
     /** @return true iff the initial oom binding is currently bound. */
     boolean isInitialBindingBound();
 
@@ skipping 39 matching lines @@
     void addModerateBinding();
 
     /**
      * Called when the service is no longer in moderate use of the consumer.
      */
     void removeModerateBinding();
 
     /** @return true iff the moderate oom binding is currently bound. */
     boolean isModerateBindingBound();
 }