Upstream: ChildProcessLauncher connects renderer processes of WebAPKs.

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 9df61cb7740bb09a2fcd1582a13624f765bcec5f..6e16fd5a831f14dcae250ac16c582f3796bc31ae 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
@@ -114,15 +114,14 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
 
         private Intent createServiceBindIntent() {
             Intent intent = new Intent();
-            if (mCreationParams != null) {
-                mCreationParams.addIntentExtras(intent);
-            }
+            mCreationParams.addIntentExtras(intent);
+
             intent.setComponent(mServiceName);
             return intent;
         }
 
         public ChildServiceConnection(int bindFlags, boolean needsExtraBindFlags) {
-            if (needsExtraBindFlags && mCreationParams != null) {
+            if (needsExtraBindFlags) {
                 bindFlags = mCreationParams.addExtraBindFlags(bindFlags);
             }
             mBindFlags = bindFlags;
@@ -220,9 +219,8 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
         mInSandbox = inSandbox;
         mDeathCallback = deathCallback;
         mServiceClass = serviceClass;
-        String packageName =
-                creationParams != null ? creationParams.getPackageName() : context.getPackageName();
-        mServiceName = new ComponentName(packageName, mServiceClass.getName() + mServiceNumber);
+        mServiceName = new ComponentName(
+                creationParams.getPackageName(), mServiceClass.getName() + mServiceNumber);
         mLinkerParams = chromiumLinkerParams;
         mAlwaysInForeground = alwaysInForeground;
         mCreationParams = creationParams;
@@ -271,6 +269,11 @@ public class ChildProcessConnectionImpl implements ChildProcessConnection {
     }
 
     @Override
+    public ChildProcessCreationParams getCreationParams() {
+        return mCreationParams;
+    }
+
+    @Override
     public IChildProcessService getService() {
         synchronized (mLock) {
             return mService;