webapk: Avoid overwriting default CreationParams

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

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
index f9561882d3c25e7fb7d6c0f5b808ba67ba99a9d2..3e65541158329b4fec2386b8b718413d791e2730 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
@@ -38,6 +38,7 @@ import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.AppHooks;
 import org.chromium.chrome.browser.ChromeApplication;
@@ -574,9 +575,11 @@ public class CustomTabsConnection {
      * @param referrer The referrer to use for |url|.
      * @return The prerendered WebContents, or null.
      */
-    WebContents takePrerenderedUrl(CustomTabsSessionToken session, String url, String referrer) {
+    WebContents takePrerenderedUrl(
+            CustomTabsSessionToken session, String url, String referrer, int childProcessParamId) {
         ThreadUtils.assertOnUiThread();
-        if (mSpeculation == null || session == null || !session.equals(mSpeculation.session)) {
+        if (mSpeculation == null || session == null || !session.equals(mSpeculation.session)
+                || childProcessParamId != ChildProcessCreationParams.DEFAULT_ID) {
             return null;
         }
 
@@ -981,7 +984,8 @@ public class CustomTabsConnection {
         if (referrer == null) referrer = "";
         Pair<WebContents, WebContents> webContentsPair =
                 mExternalPrerenderHandler.addPrerender(Profile.getLastUsedProfile(), url, referrer,
-                        contentBounds, shouldPrerenderOnCellularForSession(session));
+                        contentBounds, shouldPrerenderOnCellularForSession(session),
+                        ChildProcessCreationParams.DEFAULT_ID);
         if (webContentsPair == null) return false;
         WebContents dummyWebContents = webContentsPair.first;
         if (webContentsPair.second != null) {