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

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

Issue 2969473003: Allow data URL navigations for Android WebView until PlzNavigate ships (Closed)
Patch Set: clamy comments Created 3 years, 5 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
Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 4dd1894a4e3e5955245a08695261ab8fc35b1e8b..16a4d301442b13b7e1dd5098c356f68d104e48e5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -739,4 +739,31 @@ public class AwContentsTest extends AwTestBase {
awContents = createAwTestContainerView(mContentsClient).getAwContents();
awContents.resumeTimers();
}
+
+ /** Regression test for https://crbug.com/732976. Load a data URL, then immediately
+ * after that load a javascript URL. The data URL navigation shouldn't be blocked.
+ */
+ @LargeTest
+ @Feature({"AndroidWebView"})
+ public void testJavaScriptUrlAfterLoadData() throws Throwable {
+ AwTestContainerView testView = createAwTestContainerViewOnMainSync(mContentsClient);
+ final AwContents awContents = testView.getAwContents();
+ getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
+ public void run() {
+ // Run javascript navigation immediately, without waiting for the completion of data
+ // URL.
+ awContents.loadData("<html>test</html>", "text/html", "utf-8");
+ awContents.loadUrl("javascript: void(0)");
+ }
+ });
+
+ mContentsClient.getOnPageFinishedHelper().waitForCallback(
+ 0, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+ assertEquals("data:text/html,<html>test</html>", awContents.getLastCommittedUrl());
+
+ TestAwContentsClient.AddMessageToConsoleHelper consoleHelper =
+ mContentsClient.getAddMessageToConsoleHelper();
+ assertEquals(0, consoleHelper.getMessages().size());
+ }
}
« no previous file with comments | « android_webview/browser/aw_browser_main_parts.cc ('k') | content/browser/frame_host/data_url_navigation_throttle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698