Prevent Android webview tests from being broken by data URL deprecation

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
index 95b1b9d3aaa284ec1774e3b1985dbb6a5b2c12fd..14891670f1deda36ef6d0c725a0c896ffeab164a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
@@ -243,7 +243,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
         OnPageStartedHelper onPageStartedHelper = mContentsClient.getOnPageStartedHelper();
 
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(ABOUT_BLANK_URL), "text/html", false);
 
         final int shouldOverrideUrlLoadingCallCount =
                 mShouldOverrideUrlLoadingHelper.getCallCount();
@@ -264,7 +264,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
         final int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
 
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(ABOUT_BLANK_URL), "text/html", false);
 
         final int shouldOverrideUrlLoadingCallCount =
                 mShouldOverrideUrlLoadingHelper.getCallCount();
@@ -275,7 +275,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
 
         // After we load this URL we're certain that any in-flight callbacks for the previous
         // navigation have been delivered.
-        loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), ABOUT_BLANK_URL);
+        loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), DATA_URL);

[Torne, 2017/04/05 15:28:38]

Not sure I follow this; why does this change in the opposite direction to the
others?

[meacer, 2017/04/05 17:40:36]

The URL in line 267 is navigated by a click, and the data URL in that navigation
was going to be blocked, so I changed it to about:blank. But this line is a
direct navigation (note there is no clickOnLinkUsingJs() call after here), so we
can use a data URL.

The reason I changed this is to satisfy the comment in line 276, which as I
understand requires the test to navigate from an about:blank URL to a
non-about:blank URL.

[Torne, 2017/04/05 18:07:15]

Thanks for the explanation; that looks right, we want to navigate to just "any
other URL" at this point.

 
         assertEquals(onReceivedErrorCallCount, onReceivedErrorHelper.getCallCount());
     }
@@ -325,16 +325,16 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
     public void testCalledWhenLinkClicked() throws Throwable {
         standardSetup();
 
-        // We can't go to about:blank from here because we'd get a cross-origin error.
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(ABOUT_BLANK_URL), "text/html", false);
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
 
         clickOnLinkUsingJs();
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
-        assertEquals(DATA_URL, mShouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
+        assertEquals(
+                ABOUT_BLANK_URL, mShouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
         assertFalse(mShouldOverrideUrlLoadingHelper.isRedirect());
         assertFalse(mShouldOverrideUrlLoadingHelper.hasUserGesture());
         assertTrue(mShouldOverrideUrlLoadingHelper.isMainFrame());
@@ -483,30 +483,6 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
-    public void testCalledForDataUrl() throws Throwable {
-        standardSetup();
-        final String dataUrl =
-                "data:text/html;base64,"
-                        + "PGh0bWw+PGhlYWQ+PHRpdGxlPmRhdGFVcmxUZXN0QmFzZTY0PC90aXRsZT48"
-                        + "L2hlYWQ+PC9odG1sPg==";
-        loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                CommonResources.makeHtmlPageWithSimpleLinkTo(dataUrl), "text/html", false);
-
-        int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
-        clickOnLinkUsingJs();
-
-        mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
-        assertTrue("Expected URL that starts with 'data:' but got: <"
-                + mShouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl() + "> instead.",
-                mShouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl().startsWith(
-                        "data:"));
-        assertFalse(mShouldOverrideUrlLoadingHelper.isRedirect());
-        assertFalse(mShouldOverrideUrlLoadingHelper.hasUserGesture());
-        assertTrue(mShouldOverrideUrlLoadingHelper.isMainFrame());
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Navigation"})
     public void testCalledForUnsupportedSchemes() throws Throwable {
         standardSetup();
         final String unsupportedSchemeUrl = "foobar://resource/1";
@@ -842,7 +818,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
         int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
 
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(ABOUT_BLANK_URL), "text/html", false);
 
         int shouldOverrideUrlLoadingCallCount = mShouldOverrideUrlLoadingHelper.getCallCount();
         setShouldOverrideUrlLoadingReturnValueOnUiThread(true);