Index: chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTest.java |
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTest.java |
index 67b96e33a91f24adf4cd46f9facd135094e14f0e..8d043f34a583c915cefa5b3b370ab17927c2ebcd 100644 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTest.java |
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/document/DocumentModeTest.java |
@@ -12,11 +12,13 @@ import android.net.Uri; |
import android.os.Build; |
import android.test.FlakyTest; |
import android.test.suitebuilder.annotation.MediumTest; |
+import android.test.suitebuilder.annotation.SmallTest; |
import android.text.TextUtils; |
import android.view.View; |
import org.chromium.base.ApplicationStatus; |
import org.chromium.base.ThreadUtils; |
+import org.chromium.base.test.util.CommandLineFlags; |
import org.chromium.base.test.util.MinAndroidSdkLevel; |
import org.chromium.base.test.util.UrlUtils; |
import org.chromium.chrome.browser.ChromeActivity; |
@@ -26,12 +28,14 @@ import org.chromium.chrome.browser.IntentHandler; |
import org.chromium.chrome.browser.ShortcutHelper; |
import org.chromium.chrome.browser.tab.Tab; |
import org.chromium.chrome.browser.tabmodel.TabModel; |
+import org.chromium.chrome.browser.tabmodel.TabModelSelector; |
import org.chromium.chrome.browser.tabmodel.TabModelUtils; |
import org.chromium.chrome.browser.tabmodel.document.DocumentTabModelSelector; |
import org.chromium.chrome.browser.tabmodel.document.OffTheRecordDocumentTabModel; |
import org.chromium.chrome.test.util.ActivityUtils; |
import org.chromium.chrome.test.util.ApplicationTestUtils; |
import org.chromium.chrome.test.util.DisableInTabbedMode; |
+import org.chromium.chrome.test.util.TestHttpServerClient; |
import org.chromium.content.browser.test.util.Criteria; |
import org.chromium.content.browser.test.util.CriteriaHelper; |
import org.chromium.content.browser.test.util.TouchCommon; |
@@ -650,6 +654,38 @@ public class DocumentModeTest extends DocumentModeTestBase { |
"about:blank", IntentHandler.getUrlFromIntent(lastIntent)); |
} |
+ /** |
+ * Tests that a Weblite url from an external app uses the lite_url param when Data Reduction |
+ * Proxy previews are being used. |
+ */ |
+ @SmallTest |
+ @CommandLineFlags.Add({"enable-spdy-proxy-auth", "data-reduction-proxy-lo-fi=always-on", |
+ "enable-data-reduction-proxy-lo-fi-preview"}) |
+ public void testLaunchWebLiteURL() throws Exception { |
+ String url = TestHttpServerClient.getUrl("chrome/test/data/android/about.html"); |
+ launchViaViewIntent(false, "http://googleweblight.com/?lite_url=" + url, |
+ "Page 1"); |
+ |
+ TabModelSelector selector = ChromeApplication.getDocumentTabModelSelector(); |
+ assertEquals(1, selector.getTotalTabCount()); |
+ assertEquals(url, selector.getModel(false).getTabAt(0).getUrl()); |
+ } |
+ |
+ /** |
+ * Tests that a Weblite url from an external app does not use the lite_url param when Data |
+ * Reduction Proxy previews are not being used. |
+ */ |
+ @SmallTest |
+ public void testLaunchWebLiteURLNoPreviews() throws Exception { |
+ String url = TestHttpServerClient.getUrl( |
+ "http://googleweblight.com/?lite_url=chrome/test/data/android/about.html"); |
+ launchViaViewIntent(false, url, "Page 1"); |
+ |
+ TabModelSelector selector = ChromeApplication.getDocumentTabModelSelector(); |
+ assertEquals(1, selector.getTotalTabCount()); |
+ assertEquals(url, selector.getModel(false).getTabAt(0).getUrl()); |
+ } |
+ |
private Intent performNewWindowTest(String url, String title, boolean checkWindowOpenSuccess, |
String openTitle, boolean waitLongerForOpenedPage) throws Exception { |
launchViaLaunchDocumentInstance(false, url, title); |