webapk: Avoid overwriting default CreationParams

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

 // Copyright 2015 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.chrome.browser.customtabs;
 
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ skipping 500 matching lines @@
         if (referrerUrl == null) {
             Referrer referrer = customTabsConnection.getReferrerForSession(mSession);
             if (referrer != null) referrerUrl = referrer.getUrl();
         }
         Tab tab = new Tab(TabIdManager.getInstance().generateValidId(Tab.INVALID_TAB_ID),
                 Tab.INVALID_TAB_ID, false, this, getWindowAndroid(),
                 TabLaunchType.FROM_EXTERNAL_APP, null, null);
         tab.setAppAssociatedWith(customTabsConnection.getClientPackageNameForSession(mSession));
 
         mPrerenderedUrl = customTabsConnection.getPrerenderedUrl(mSession);
+        CustomTabDelegateFactory delegateFactory =
+                new CustomTabDelegateFactory(mIntentDataProvider.shouldEnableUrlBarHiding(),
+                        mIntentDataProvider.isOpenedByChrome(),
+                        getFullscreenManager().getBrowserVisibilityDelegate());
         int webContentsStateOnLaunch = WEBCONTENTS_STATE_NO_WEBCONTENTS;
-        WebContents webContents =
-                customTabsConnection.takePrerenderedUrl(mSession, url, referrerUrl);
+        WebContents webContents = customTabsConnection.takePrerenderedUrl(
+                mSession, url, referrerUrl, delegateFactory.getChildProcessParamId());
         mHasPrerendered = webContents != null;
         if (mHasPrerendered) webContentsStateOnLaunch = WEBCONTENTS_STATE_PRERENDERED_WEBCONTENTS;
         if (!mHasPrerendered) {
-            webContents = WarmupManager.getInstance().takeSpareWebContents(false, false);
+            webContents = WarmupManager.getInstance().takeSpareWebContents(
+                    false, false, delegateFactory.getChildProcessParamId());
             if (webContents != null) webContentsStateOnLaunch = WEBCONTENTS_STATE_SPARE_WEBCONTENTS;
         }
         RecordHistogram.recordEnumeratedHistogram("CustomTabs.WebContentsStateOnLaunch",
                 webContentsStateOnLaunch, WEBCONTENTS_STATE_MAX);
-        if (webContents == null) webContents = WebContentsFactory.createWebContents(false, false);
+        if (webContents == null) {
+            webContents = WebContentsFactory.createWebContents(
+                    delegateFactory.getChildProcessParamId(), false, false);
+        }
         if (!mHasPrerendered) {
             customTabsConnection.resetPostMessageHandlerForSession(mSession, webContents);
         }
-        tab.initialize(
-                webContents, getTabContentManager(),
-                new CustomTabDelegateFactory(
-                        mIntentDataProvider.shouldEnableUrlBarHiding(),
-                        mIntentDataProvider.isOpenedByChrome(),
-                        getFullscreenManager().getBrowserVisibilityDelegate()),
-                false, false);
+        tab.initialize(webContents, getTabContentManager(), delegateFactory, false, false);
         initializeMainTab(tab);
         return tab;
     }
 
     private void initializeMainTab(Tab tab) {
         tab.getTabRedirectHandler().updateIntent(getIntent());
         tab.getView().requestFocus();
         mTabObserver = new CustomTabObserver(
                 getApplication(), mSession, mIntentDataProvider.isOpenedByChrome());
 
@@ skipping 516 matching lines @@
         Intent intent = ChromeLauncherActivity.createCustomTabActivityIntent(
                 context, customTabIntent.intent, false);
         intent.setPackage(context.getPackageName());
         intent.putExtra(CustomTabIntentDataProvider.EXTRA_IS_INFO_PAGE, true);
         intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
         IntentHandler.addTrustedIntentExtras(intent);
 
         context.startActivity(intent);
     }
 }