Prevent Android webview tests from being broken by data URL deprecation

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

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview.test;
 
 import android.annotation.SuppressLint;
 import android.support.test.filters.SmallTest;
 import android.util.Pair;
 
@@ skipping 232 matching lines @@
         assertEquals(TITLE, getTitleOnUiThread(mAwContents));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testCalledBeforeOnPageStarted() throws Throwable {
         standardSetup();
         OnPageStartedHelper onPageStartedHelper = mContentsClient.getOnPageStartedHelper();
 
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(
+                        ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL),
+                "text/html", false);
 
         final int shouldOverrideUrlLoadingCallCount =
                 mShouldOverrideUrlLoadingHelper.getCallCount();
         final int onPageStartedCallCount = onPageStartedHelper.getCallCount();
         setShouldOverrideUrlLoadingReturnValueOnUiThread(true);
         clickOnLinkUsingJs();
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
         assertEquals(onPageStartedCallCount, onPageStartedHelper.getCallCount());
     }
 
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testDoesNotCauseOnReceivedError() throws Throwable {
         standardSetup();
         OnReceivedErrorHelper onReceivedErrorHelper = mContentsClient.getOnReceivedErrorHelper();
         final int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
 
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(
+                        ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL),
+                "text/html", false);
 
         final int shouldOverrideUrlLoadingCallCount =
                 mShouldOverrideUrlLoadingHelper.getCallCount();
         setShouldOverrideUrlLoadingReturnValueOnUiThread(true);
         clickOnLinkUsingJs();
         mShouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
         setShouldOverrideUrlLoadingReturnValueOnUiThread(false);
 
         // After we load this URL we're certain that any in-flight callbacks for the previous
         // navigation have been delivered.
-        loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL);
+        loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), DATA_URL);
 
         assertEquals(onReceivedErrorCallCount, onReceivedErrorHelper.getCallCount());
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testNotCalledForAnchorNavigations() throws Throwable {
         doTestNotCalledForAnchorNavigations(false);
     }
 
@@ skipping 30 matching lines @@
 
         assertEquals(shouldOverrideUrlLoadingCallCount,
                 mShouldOverrideUrlLoadingHelper.getCallCount());
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     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(
+                        ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL),
+                "text/html", false);
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
 
         clickOnLinkUsingJs();
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
-        assertEquals(DATA_URL, mShouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
+        assertEquals(ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL,
+                mShouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
         assertFalse(mShouldOverrideUrlLoadingHelper.isRedirect());
         assertFalse(mShouldOverrideUrlLoadingHelper.hasUserGesture());
         assertTrue(mShouldOverrideUrlLoadingHelper.isMainFrame());
     }
 
     /*
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     */
     @DisabledTest(message = "crbug.com/462306")
@@ skipping 129 matching lines @@
 
         loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), synchronizationUrl);
 
         assertEquals(1, mWebServer.getRequestCount(pageWithLinkToIgnorePath));
         assertEquals(1, mWebServer.getRequestCount(synchronizationPath));
         assertEquals(0, mWebServer.getRequestCount(REDIRECT_TARGET_PATH));
     }
 
     @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";
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 CommonResources.makeHtmlPageWithSimpleLinkTo(unsupportedSchemeUrl), "text/html",
                 false);
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
         clickOnLinkUsingJs();
 
@@ skipping 315 matching lines @@
         }
 
         mContentsClient = new DestroyInCallbackClient();
         setupWithProvidedContentsClient(mContentsClient);
         mShouldOverrideUrlLoadingHelper = mContentsClient.getShouldOverrideUrlLoadingHelper();
 
         OnReceivedErrorHelper onReceivedErrorHelper = mContentsClient.getOnReceivedErrorHelper();
         int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
 
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
-                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(
+                        ContentUrlConstants.ABOUT_BLANK_DISPLAY_URL),
+                "text/html", false);
 
         int shouldOverrideUrlLoadingCallCount = mShouldOverrideUrlLoadingHelper.getCallCount();
         setShouldOverrideUrlLoadingReturnValueOnUiThread(true);
         clickOnLinkUsingJs();
         mShouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
 
         pollUiThread(new Callable<Boolean>() {
             @Override
             public Boolean call() {
                 return AwContents.getNativeInstanceCount() == 0;
@@ skipping 253 matching lines @@
         doTestClickableContent(TEST_PHONE, TEST_PHONE_URI, false);
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     @CommandLineFlags.Add({ContentSwitches.ENABLE_CONTENT_INTENT_DETECTION})
     public void testClickableAddressInIframe() throws Throwable {
         doTestClickableContent(TEST_ADDRESS, TEST_ADDRESS_URI, false);
     }
 }