Revert "Upstream Context.BIND_EXTERNAL_SERVICE" (2/3)

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

Index: content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java
index 1e4a0f13140223c7ef76fc8d57e972272a206d40..14858481abd4182dd4ff15f164ea36893ebf0396 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java
@@ -11,10 +11,12 @@ import org.chromium.base.library_loader.LibraryProcessType;
 /**
  * Allows specifying the package name for looking up child services
  * configuration and classes into (if it differs from the application
- * package name, like in the case of Android WebView).
+ * package name, like in the case of Android WebView). Also allows
+ * specifying additional child service binging flags.
  */
 public class ChildProcessCreationParams {
     private final String mPackageName;
+    private final int mExtraBindFlags;
     private final int mLibraryProcessType;
     private static final String EXTRA_LIBRARY_PROCESS_TYPE =
             "org.chromium.content.common.child_service_params.library_process_type";
@@ -29,23 +31,40 @@ public class ChildProcessCreationParams {
         return sChildProcessCreationParams;
     }
 
-    public ChildProcessCreationParams(String packageName, int libraryProcessType) {
+    public ChildProcessCreationParams(String packageName, int extraBindFlags,
+            int libraryProcessType) {
         mPackageName = packageName;
+        mExtraBindFlags = extraBindFlags;
         mLibraryProcessType = libraryProcessType;
     }
 
     public ChildProcessCreationParams copy() {
-        return new ChildProcessCreationParams(mPackageName, mLibraryProcessType);
+        return new ChildProcessCreationParams(mPackageName, mExtraBindFlags, mLibraryProcessType);
     }
 
     public String getPackageName() {
         return mPackageName;
     }
 
+    public int getExtraBindFlags() {
+        return mExtraBindFlags;
+    }
+
     public int getLibraryProcessType() {
         return mLibraryProcessType;
     }
 
+    /**
+     * Adds required extra flags to the given child service binding flags and returns them.
+     * Does not modify the state of the ChildProcessCreationParams instance.
+     *
+     * @param bindFlags Source bind flags to modify.
+     * @return Bind flags with extra flags added.
+     */
+    public int addExtraBindFlags(int bindFlags) {
+        return bindFlags | mExtraBindFlags;
+    }
+
     public void addIntentExtras(Intent intent) {
         intent.putExtra(EXTRA_LIBRARY_PROCESS_TYPE, mLibraryProcessType);
     }