Upstream: ChildProcessLauncher connects renderer processes of WebAPKs.

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

 // Copyright 2013 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.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
@@ skipping 96 matching lines @@
     // call.
     private ChildProcessConnection.ConnectionCallback mConnectionCallback;
 
     private class ChildServiceConnection implements ServiceConnection {
         private boolean mBound = false;
 
         private final int mBindFlags;
 
         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;
         }
 
         boolean bind(String[] commandLine) {
             if (!mBound) {
                 try {
                     TraceEvent.begin("ChildProcessConnectionImpl.ChildServiceConnection.bind");
                     final Intent intent = createServiceBindIntent();
@@ skipping 77 matching lines @@
             ChildProcessConnection.DeathCallback deathCallback,
             Class<? extends ChildProcessService> serviceClass,
             ChromiumLinkerParams chromiumLinkerParams,
             boolean alwaysInForeground,
             ChildProcessCreationParams creationParams) {
         mContext = context;
         mServiceNumber = number;
         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;
         int initialFlags = Context.BIND_AUTO_CREATE;
         if (mAlwaysInForeground) initialFlags |= Context.BIND_IMPORTANT;
         // "external service" attribute is approximated by "exported" attribute.
         // TODO(mnaganov): Update after the release of the next Android SDK.
         final boolean needsExtraBindFlags = isExportedService(inSandbox, mContext, mServiceName);
         mInitialBinding = new ChildServiceConnection(initialFlags, needsExtraBindFlags);
         mStrongBinding = new ChildServiceConnection(
@@ skipping 28 matching lines @@
     public int getServiceNumber() {
         return mServiceNumber;
     }
 
     @Override
     public boolean isInSandbox() {
         return mInSandbox;
     }
 
     @Override
+    public ChildProcessCreationParams getCreationParams() {
+        return mCreationParams;
+    }
+
+    @Override
     public IChildProcessService getService() {
         synchronized (mLock) {
             return mService;
         }
     }
 
     @Override
     public int getPid() {
         synchronized (mLock) {
             return mPid;
@@ skipping 227 matching lines @@
             return true;
         }
         return false;
     }
 
     @VisibleForTesting
     public boolean isConnected() {
         return mService != null;
     }
 }