Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(442)

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

Issue 2080173006: customtabs: Allowing prerendering on cellular also disables throttling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a test. Created 4 years, 6 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
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/customtabs/RequestThrottler.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 e75b261028337ffc69b1c9437a3a1f338cdf1ad0..f7d47e18e05407f605eecb8e2be560a1fa680df2 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
@@ -23,10 +23,13 @@ import org.chromium.base.ThreadUtils;
import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.base.library_loader.LibraryProcessType;
import org.chromium.base.test.util.Restriction;
+import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.content_public.browser.WebContents;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
/** Tests for CustomTabsConnection. */
public class CustomTabsConnectionTest extends InstrumentationTestCase {
@@ -47,6 +50,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER)
.ensureInitialized(mContext);
mCustomTabsConnection = CustomTabsTestUtils.setUpConnection((Application) mContext);
+ mCustomTabsConnection.resetThrottling(mContext, Process.myUid());
}
@Override
@@ -456,4 +460,83 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
}
assertWarmupAndMayLaunchUrl(token2, URL, false);
}
+
+ @SmallTest
+ @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
+ public void testBanningWorks() {
+ mCustomTabsConnection.ban(mContext, Process.myUid());
+ final CustomTabsSessionToken token =
+ CustomTabsSessionToken.createDummySessionTokenForTesting();
+ assertTrue(mCustomTabsConnection.newSession(token));
+
+ assertTrue(mCustomTabsConnection.mayLaunchUrl(token, Uri.parse(URL), null, null));
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ assertSpareWebContentsNotNullAndDestroy();
+ String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
+ assertNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));
+ }
+ });
+ }
+
+ @SmallTest
+ @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
+ public void testBanningDisabledForCellular() {
+ mCustomTabsConnection.ban(mContext, Process.myUid());
+ final CustomTabsSessionToken token =
+ CustomTabsSessionToken.createDummySessionTokenForTesting();
+ assertTrue(mCustomTabsConnection.newSession(token));
+ mCustomTabsConnection.setShouldPrerenderOnCellularForSession(token, true);
+
+ assertTrue(mCustomTabsConnection.mayLaunchUrl(token, Uri.parse(URL), null, null));
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ assertNull(mCustomTabsConnection.takeSpareWebContents());
+ String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
+ WebContents prerender = mCustomTabsConnection.takePrerenderedUrl(
+ token, URL, referrer);
+ assertNotNull(prerender);
+ prerender.destroy();
+ }
+ });
+ }
+
+ @SmallTest
+ @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
+ public void testCellularPrerenderingDoesntOverrideSettings() throws Exception {
+ CustomTabsSessionToken token = CustomTabsSessionToken.createDummySessionTokenForTesting();
+ assertTrue(mCustomTabsConnection.newSession(token));
+ mCustomTabsConnection.setShouldPrerenderOnCellularForSession(token, true);
+ mCustomTabsConnection.warmup(0);
+
+ // Needs the browser process to be initialized.
+ FutureTask<Boolean> result = ThreadUtils.runOnUiThread(new Callable<Boolean>() {
+ @Override
+ public Boolean call() {
+ PrefServiceBridge prefs = PrefServiceBridge.getInstance();
+ boolean result = prefs.getNetworkPredictionEnabled();
+ prefs.setNetworkPredictionEnabled(false);
+ return result;
+ }});
+ final boolean enabled = result.get();
+
+ try {
+ assertTrue(mCustomTabsConnection.mayLaunchUrl(token, Uri.parse(URL), null, null));
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ assertSpareWebContentsNotNullAndDestroy();
+ }
+ });
+ } finally {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ PrefServiceBridge.getInstance().setNetworkPredictionEnabled(enabled);
+ }
+ });
+ }
+ }
}
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/customtabs/RequestThrottler.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698