webapk: Avoid overwriting default CreationParams

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
index 9c9a0f77164cd9bd60b6b3a4ee9aae0f11270f57..384fe9b0a0fb41245599581e033229f1d09c6036 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
@@ -26,6 +26,7 @@ import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.WarmupManager;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+import org.chromium.content.browser.ChildProcessCreationParams;
 import org.chromium.content_public.browser.WebContents;
 
 import java.util.ArrayList;
@@ -110,7 +111,8 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
             public void run() {
                 WarmupManager warmupManager = WarmupManager.getInstance();
                 assertTrue(warmupManager.hasSpareWebContents());
-                WebContents webContents = warmupManager.takeSpareWebContents(false, false);
+                WebContents webContents = warmupManager.takeSpareWebContents(
+                        false, false, ChildProcessCreationParams.DEFAULT_ID);
                 assertNotNull(webContents);
                 assertFalse(warmupManager.hasSpareWebContents());
                 webContents.destroy();
@@ -148,8 +150,8 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
                 assertFalse(WarmupManager.getInstance().hasSpareWebContents());
                 String referrer =
                         mCustomTabsConnection.getReferrerForSession(token).getUrl();
-                WebContents webContents =
-                        mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer);
+                WebContents webContents = mCustomTabsConnection.takePrerenderedUrl(
+                        token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID);
                 assertNotNull(webContents);
                 webContents.destroy();
             }
@@ -225,7 +227,8 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
             public void run() {
                 assertSpareWebContentsNotNullAndDestroy();
                 String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
-                assertNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));
+                assertNull(mCustomTabsConnection.takePrerenderedUrl(
+                        token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID));
             }
         });
     }
@@ -295,9 +298,11 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));
+                assertNull(WarmupManager.getInstance().takeSpareWebContents(
+                        false, false, ChildProcessCreationParams.DEFAULT_ID));
                 String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
-                assertNotNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));
+                assertNotNull(mCustomTabsConnection.takePrerenderedUrl(
+                        token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID));
             }
         });
     }
@@ -330,7 +335,8 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));
+                assertNull(WarmupManager.getInstance().takeSpareWebContents(
+                        false, false, ChildProcessCreationParams.DEFAULT_ID));
             }
         });
         assertTrue(mCustomTabsConnection.mayLaunchUrl(token, null, null, null));
@@ -339,13 +345,15 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
             @Override
             public void run() {
                 String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
-                assertNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));
+                assertNull(mCustomTabsConnection.takePrerenderedUrl(
+                        token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID));
             }
         });
     }
 
     private void assertSpareWebContentsNotNullAndDestroy() {
-        WebContents webContents = WarmupManager.getInstance().takeSpareWebContents(false, false);
+        WebContents webContents = WarmupManager.getInstance().takeSpareWebContents(
+                false, false, ChildProcessCreationParams.DEFAULT_ID);
         assertNotNull(webContents);
         webContents.destroy();
     }
@@ -531,7 +539,8 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
             public void run() {
                 assertSpareWebContentsNotNullAndDestroy();
                 String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
-                assertNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));
+                assertNull(mCustomTabsConnection.takePrerenderedUrl(
+                        token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID));
             }
         });
     }
@@ -549,10 +558,11 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));
+                assertNull(WarmupManager.getInstance().takeSpareWebContents(
+                        false, false, ChildProcessCreationParams.DEFAULT_ID));
                 String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
                 WebContents prerender = mCustomTabsConnection.takePrerenderedUrl(
-                        token, URL, referrer);
+                        token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID);
                 assertNotNull(prerender);
                 prerender.destroy();
             }