webapk: Avoid overwriting default CreationParams

chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
index 4bda45bf4a703bcb7f2c3d1486bd1856026e6cb9..258ca904851aab2659f3b91ba1b41c5c10b3c1f4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
@@ -23,6 +23,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.widget.ControlContainer;
+import org.chromium.content.browser.ChildProcessCreationParams;
 import org.chromium.content_public.browser.WebContents;
 
 import java.net.InetAddress;
@@ -220,7 +221,8 @@ public final class WarmupManager {
     public void createSpareWebContents() {
         ThreadUtils.assertOnUiThread();
         if (mSpareWebContents != null || SysUtils.isLowEndDevice()) return;
-        mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(false, false);
+        mSpareWebContents = WebContentsFactory.createWebContentsWithWarmRenderer(
+                ChildProcessCreationParams.DEFAULT_ID, false, false);
     }
 
     /**
@@ -240,9 +242,13 @@ public final class WarmupManager {
      *
      * @return a WebContents, or null.
      */
-    public WebContents takeSpareWebContents(boolean incognito, boolean initiallyHidden) {
+    public WebContents takeSpareWebContents(
+            boolean incognito, boolean initiallyHidden, int childProcessParamId) {

[boliu, 2017/02/23 00:51:30]

so this s a general pattern I followed here. All warmup/prerender all use the
default params (because in general there's no corresponding activity when they
are created). I hope this forces the caller to make a choice about what the
childProcessParamId is.

         ThreadUtils.assertOnUiThread();
-        if (incognito || initiallyHidden) return null;
+        if (incognito || initiallyHidden
+                || childProcessParamId != ChildProcessCreationParams.DEFAULT_ID) {
+            return null;
+        }
         WebContents result = mSpareWebContents;
         mSpareWebContents = null;
         return result;