chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java - Issue 2706933003: webapk: Avoid overwriting default CreationParams

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

Issue 2706933003: webapk: Avoid overwriting default CreationParams

Patch Set: rebase 461342 Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 211100f19fb5d2a5a426ce9d68f1792e43da034f..f749a5098b941063e574144383459d19e3d1ce8c 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

@@ -28,6 +28,7 @@ import org.chromium.base.PathUtils;

import org.chromium.base.ThreadUtils;

import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.base.library_loader.LibraryProcessType;

+import org.chromium.base.process_launcher.ChildProcessCreationParams;

import org.chromium.base.test.util.Restriction;

import org.chromium.base.test.util.RetryOnFailure;

import org.chromium.chrome.browser.WarmupManager;

@@ -122,7 +123,8 @@ public class CustomTabsConnectionTest {

public void run() {

WarmupManager warmupManager = WarmupManager.getInstance();

Assert.assertTrue(warmupManager.hasSpareWebContents());

- WebContents webContents = warmupManager.takeSpareWebContents(false, false);

+ WebContents webContents = warmupManager.takeSpareWebContents(

+ false, false, ChildProcessCreationParams.DEFAULT_ID);

Assert.assertNotNull(webContents);

Assert.assertFalse(warmupManager.hasSpareWebContents());

webContents.destroy();

@@ -162,8 +164,8 @@ public class CustomTabsConnectionTest {

Assert.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);

Assert.assertNotNull(webContents);

webContents.destroy();

}

@@ -243,7 +245,8 @@ public class CustomTabsConnectionTest {

public void run() {

assertSpareWebContentsNotNullAndDestroy();

String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();

- Assert.assertNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));

+ Assert.assertNull(mCustomTabsConnection.takePrerenderedUrl(

+ token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID));

}

});

}

@@ -316,10 +319,11 @@ public class CustomTabsConnectionTest {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- Assert.assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));

+ Assert.assertNull(WarmupManager.getInstance().takeSpareWebContents(

+ false, false, ChildProcessCreationParams.DEFAULT_ID));

String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();

- Assert.assertNotNull(

- mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));

+ Assert.assertNotNull(mCustomTabsConnection.takePrerenderedUrl(

+ token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID));

}

});

}

@@ -354,7 +358,8 @@ public class CustomTabsConnectionTest {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- Assert.assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));

+ Assert.assertNull(WarmupManager.getInstance().takeSpareWebContents(

+ false, false, ChildProcessCreationParams.DEFAULT_ID));

}

});

Assert.assertTrue(mCustomTabsConnection.mayLaunchUrl(token, null, null, null));

@@ -363,13 +368,15 @@ public class CustomTabsConnectionTest {

@Override

public void run() {

String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();

- Assert.assertNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));

+ Assert.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);

Assert.assertNotNull(webContents);

webContents.destroy();

}

@@ -565,7 +572,8 @@ public class CustomTabsConnectionTest {

public void run() {

assertSpareWebContentsNotNullAndDestroy();

String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();

- Assert.assertNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));

+ Assert.assertNull(mCustomTabsConnection.takePrerenderedUrl(

+ token, URL, referrer, ChildProcessCreationParams.DEFAULT_ID));

}

});

}

@@ -584,10 +592,11 @@ public class CustomTabsConnectionTest {

ThreadUtils.runOnUiThreadBlocking(new Runnable() {

@Override

public void run() {

- Assert.assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));

+ Assert.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);

Assert.assertNotNull(prerender);

prerender.destroy();

}