| Index: chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java
|
| index 944b15dee84a2c938bca86c3e33cb28ab8af701e..f7f12454f99bcb8c35906673ade68cd879be2c67 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java
|
| @@ -14,6 +14,7 @@ import android.test.UiThreadTest;
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.test.util.Restriction;
|
| import org.chromium.chrome.R;
|
| +import org.chromium.content.browser.ChildProcessCreationParams;
|
| import org.chromium.content.browser.test.NativeLibraryTestBase;
|
| import org.chromium.content.browser.test.util.Criteria;
|
| import org.chromium.content.browser.test.util.CriteriaHelper;
|
| @@ -69,7 +70,8 @@ public class WarmupManagerTest extends NativeLibraryTestBase {
|
| public void run() {
|
| mWarmupManager.createSpareWebContents();
|
| assertTrue(mWarmupManager.hasSpareWebContents());
|
| - WebContents webContents = mWarmupManager.takeSpareWebContents(false, false);
|
| + WebContents webContents = mWarmupManager.takeSpareWebContents(
|
| + false, false, ChildProcessCreationParams.DEFAULT_ID);
|
| assertNotNull(webContents);
|
| assertFalse(mWarmupManager.hasSpareWebContents());
|
| WebContentsObserver observer = new WebContentsObserver(webContents) {
|
| @@ -105,7 +107,8 @@ public class WarmupManagerTest extends NativeLibraryTestBase {
|
| @UiThreadTest
|
| public void testTakeSpareWebContents() throws Exception {
|
| mWarmupManager.createSpareWebContents();
|
| - WebContents webContents = mWarmupManager.takeSpareWebContents(false, false);
|
| + WebContents webContents = mWarmupManager.takeSpareWebContents(
|
| + false, false, ChildProcessCreationParams.DEFAULT_ID);
|
| assertNotNull(webContents);
|
| assertFalse(mWarmupManager.hasSpareWebContents());
|
| webContents.destroy();
|
| @@ -116,9 +119,12 @@ public class WarmupManagerTest extends NativeLibraryTestBase {
|
| @UiThreadTest
|
| public void testTakeSpareWebContentsChecksArguments() throws Exception {
|
| mWarmupManager.createSpareWebContents();
|
| - assertNull(mWarmupManager.takeSpareWebContents(true, false));
|
| - assertNull(mWarmupManager.takeSpareWebContents(false, true));
|
| - assertNull(mWarmupManager.takeSpareWebContents(true, true));
|
| + assertNull(mWarmupManager.takeSpareWebContents(
|
| + true, false, ChildProcessCreationParams.DEFAULT_ID));
|
| + assertNull(mWarmupManager.takeSpareWebContents(
|
| + false, true, ChildProcessCreationParams.DEFAULT_ID));
|
| + assertNull(mWarmupManager.takeSpareWebContents(
|
| + true, true, ChildProcessCreationParams.DEFAULT_ID));
|
| assertTrue(mWarmupManager.hasSpareWebContents());
|
| }
|
|
|
|
|