[android_webview] Add more params to request intercepting.

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.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 
 import org.chromium.android_webview.AwContents;
@@ skipping 46 matching lines @@
             final TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideHelper,
             final boolean value) throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 shouldOverrideHelper.setShouldOverrideUrlLoadingReturnValue(value);
             }
         });
     }
 
-    private String makeHtmlPageFrom(String headers, String body) {
-        return CommonResources.makeHtmlPageFrom("<title>" + TITLE + "</title> " + headers, body);
+    private String getTestPageCommonHeaders() {
+        return "<title>" + TITLE + "</title> ";
     }
 
-    private String getHtmlForPageWithSimpleLinkTo(String destination) {
-        return makeHtmlPageFrom("",
-                        "<a href=\"" + destination + "\" id=\"link\">" +
-                           "<img class=\"big\" />" +
-                        "</a>");
+    private String makeHtmlPageFrom(String headers, String body) {
+        return CommonResources.makeHtmlPageFrom(getTestPageCommonHeaders() + headers, body);
     }
 
     private String getHtmlForPageWithJsAssignLinkTo(String url) {
         return makeHtmlPageFrom("",
                 "<img onclick=\"location.href='" + url + "'\" class=\"big\" id=\"link\" />");
     }
 
     private String getHtmlForPageWithJsReplaceLinkTo(String url) {
         return makeHtmlPageFrom("",
                 "<img onclick=\"location.replace('" + url + "');\" class=\"big\" id=\"link\" />");
@@ skipping 11 matching lines @@
                     "location.href = '" + url + "';" +
                   "} " +
                   "function doRedirectReplace() {" +
                     "location.replace('" + url + "');" +
                   "} " +
                 "</script>",
                 String.format("<iframe onLoad=\"setTimeout('doRedirect%s()', %d);\" />",
                     method, timeout));
     }
 
-    private String getHtmlForPageWithSimplePostFormTo(String destination) {
-        return makeHtmlPageFrom("",
-                "<form action=\"" + destination + "\" method=\"post\">" +
-                  "<input type=\"submit\" value=\"post\" id=\"link\">" +
-                "</form>");
-    }
-
     private String addPageToTestServer(TestWebServer webServer, String httpPath, String html) {
         List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();
         headers.add(Pair.create("Content-Type", "text/html"));
         headers.add(Pair.create("Cache-Control", "no-store"));
         return webServer.setResponse(httpPath, html, headers);
     }
 
     private String createRedirectTargetPage(TestWebServer webServer) {
         return addPageToTestServer(webServer, REDIRECT_TARGET_PATH,
                 makeHtmlPageFrom("", "<div>This is the end of the redirect chain</div>"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testNotCalledOnLoadUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
             contentsClient.getShouldOverrideUrlLoadingHelper();
 
         loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
         assertEquals(0, shouldOverrideUrlLoadingHelper.getCallCount());
     }
 
     private void waitForNavigationRunnableAndAssertTitleChanged(AwContents awContents,
             CallbackHelper onPageFinishedHelper,
             Runnable navigationRunnable) throws Exception {
         final int callCount = onPageFinishedHelper.getCallCount();
         final String oldTitle = getTitleOnUiThread(awContents);
         getInstrumentation().runOnMainSync(navigationRunnable);
@@ skipping 62 matching lines @@
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
             contentsClient.getShouldOverrideUrlLoadingHelper();
 
         setShouldOverrideUrlLoadingReturnValueOnUiThread(shouldOverrideUrlLoadingHelper, true);
 
         loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(getTestPageCommonHeaders(),
+                    DATA_URL), "text/html", false);
 
         assertEquals(TITLE, getTitleOnUiThread(awContents));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testCalledBeforeOnPageStarted() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
             contentsClient.getShouldOverrideUrlLoadingHelper();
         OnPageStartedHelper onPageStartedHelper = contentsClient.getOnPageStartedHelper();
 
         loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
         final int shouldOverrideUrlLoadingCallCount = shouldOverrideUrlLoadingHelper.getCallCount();
         final int onPageStartedCallCount = onPageStartedHelper.getCallCount();
         setShouldOverrideUrlLoadingReturnValueOnUiThread(shouldOverrideUrlLoadingHelper, true);
         clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
         assertEquals(onPageStartedCallCount, onPageStartedHelper.getCallCount());
     }
 
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testDoesNotCauseOnReceivedError() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         final TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
             contentsClient.getShouldOverrideUrlLoadingHelper();
         OnReceivedErrorHelper onReceivedErrorHelper = contentsClient.getOnReceivedErrorHelper();
         final int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
 
         loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
         final int shouldOverrideUrlLoadingCallCount = shouldOverrideUrlLoadingHelper.getCallCount();
 
         setShouldOverrideUrlLoadingReturnValueOnUiThread(shouldOverrideUrlLoadingHelper, true);
 
         clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
 
         setShouldOverrideUrlLoadingReturnValueOnUiThread(shouldOverrideUrlLoadingHelper, false);
@@ skipping 21 matching lines @@
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         final TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
             contentsClient.getShouldOverrideUrlLoadingHelper();
 
         final String anchorLinkPath = "/anchor_link.html";
         final String anchorLinkUrl = mWebServer.getResponseUrl(anchorLinkPath);
         addPageToTestServer(mWebServer, anchorLinkPath,
-                getHtmlForPageWithSimpleLinkTo(anchorLinkUrl + "#anchor"));
+                CommonResources.makeHtmlPageWithSimpleLinkTo(anchorLinkUrl + "#anchor"));
 
         if (useLoadData) {
             loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                    getHtmlForPageWithSimpleLinkTo("#anchor"), "text/html", false);
+                    CommonResources.makeHtmlPageWithSimpleLinkTo("#anchor"), "text/html", false);
         } else {
             loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), anchorLinkUrl);
         }
 
         final int shouldOverrideUrlLoadingCallCount =
             shouldOverrideUrlLoadingHelper.getCallCount();
 
         clickOnLinkUsingJs(awContents, contentsClient);
 
         // After we load this URL we're certain that any in-flight callbacks for the previous
         // navigation have been delivered.
         loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), ABOUT_BLANK_URL);
 
         assertEquals(shouldOverrideUrlLoadingCallCount,
                 shouldOverrideUrlLoadingHelper.getCallCount());
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testCalledWhenLinkClicked() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
                 contentsClient.getShouldOverrideUrlLoadingHelper();
 
         // We can't go to about:blank from here because we'd get a cross-origin error.
         loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
         int callCount = shouldOverrideUrlLoadingHelper.getCallCount();
 
         clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(callCount);
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testCalledWhenTopLevelAboutBlankNavigation() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
                 contentsClient.getShouldOverrideUrlLoadingHelper();
 
         final String httpPath = "/page_with_about_blank_navigation";
         final String httpPathOnServer = mWebServer.getResponseUrl(httpPath);
         addPageToTestServer(mWebServer, httpPath,
-                getHtmlForPageWithSimpleLinkTo(ABOUT_BLANK_URL));
+                CommonResources.makeHtmlPageWithSimpleLinkTo(ABOUT_BLANK_URL));
 
         loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 httpPathOnServer);
 
         int callCount = shouldOverrideUrlLoadingHelper.getCallCount();
 
         clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertEquals(ABOUT_BLANK_URL,
                 shouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testCalledWhenSelfLinkClicked() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
                 contentsClient.getShouldOverrideUrlLoadingHelper();
 
         final String httpPath = "/page_with_link_to_self.html";
         final String httpPathOnServer = mWebServer.getResponseUrl(httpPath);
         addPageToTestServer(mWebServer, httpPath,
-                getHtmlForPageWithSimpleLinkTo(httpPathOnServer));
+                CommonResources.makeHtmlPageWithSimpleLinkTo(httpPathOnServer));
 
         loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 httpPathOnServer);
 
         int callCount = shouldOverrideUrlLoadingHelper.getCallCount();
 
         clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertEquals(httpPathOnServer,
@@ skipping 49 matching lines @@
     public void testPassesCorrectUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
                 contentsClient.getShouldOverrideUrlLoadingHelper();
 
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
         loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                getHtmlForPageWithSimpleLinkTo(redirectTargetUrl), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(redirectTargetUrl), "text/html",
+                false);
 
         int callCount = shouldOverrideUrlLoadingHelper.getCallCount();
         clickOnLinkUsingJs(awContents, contentsClient);
         shouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertEquals(redirectTargetUrl,
                 shouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testCanIgnoreLoading() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         final TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
                 contentsClient.getShouldOverrideUrlLoadingHelper();
 
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
         final String pageWithLinkToIgnorePath = "/page_with_link_to_ignore.html";
         final String pageWithLinkToIgnoreUrl = addPageToTestServer(mWebServer,
                 pageWithLinkToIgnorePath,
-                getHtmlForPageWithSimpleLinkTo(redirectTargetUrl));
+                CommonResources.makeHtmlPageWithSimpleLinkTo(redirectTargetUrl));
         final String synchronizationPath = "/sync.html";
         final String synchronizationUrl = addPageToTestServer(mWebServer,
                 synchronizationPath,
-                getHtmlForPageWithSimpleLinkTo(redirectTargetUrl));
+                CommonResources.makeHtmlPageWithSimpleLinkTo(redirectTargetUrl));
 
         loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 pageWithLinkToIgnoreUrl);
 
         setShouldOverrideUrlLoadingReturnValueOnUiThread(shouldOverrideUrlLoadingHelper, true);
 
         int callCount = shouldOverrideUrlLoadingHelper.getCallCount();
         clickOnLinkUsingJs(awContents, contentsClient);
         // Some time around here true should be returned from the shouldOverrideUrlLoading
         // callback causing the navigation caused by calling clickOnLinkUsingJs to be ignored.
@@ skipping 16 matching lines @@
                 "data:text/html;base64," +
                 "PGh0bWw+PGhlYWQ+PHRpdGxlPmRhdGFVcmxUZXN0QmFzZTY0PC90aXRsZT48" +
                 "L2hlYWQ+PC9odG1sPg==";
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
                 contentsClient.getShouldOverrideUrlLoadingHelper();
         loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                getHtmlForPageWithSimpleLinkTo(dataUrl), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(dataUrl), "text/html", false);
 
         int callCount = shouldOverrideUrlLoadingHelper.getCallCount();
         clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertTrue("Expected URL that starts with 'data:' but got: <" +
                    shouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl() + "> instead.",
                    shouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl().startsWith(
                            "data:"));
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testCalledForUnsupportedSchemes() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
                 contentsClient.getShouldOverrideUrlLoadingHelper();
         final String unsupportedSchemeUrl = "foobar://resource/1";
         loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
-                getHtmlForPageWithSimpleLinkTo(unsupportedSchemeUrl), "text/html", false);
+                CommonResources.makeHtmlPageWithSimpleLinkTo(unsupportedSchemeUrl), "text/html",
+                false);
 
         int callCount = shouldOverrideUrlLoadingHelper.getCallCount();
         clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertEquals(unsupportedSchemeUrl,
                 shouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Navigation"})
     public void testNotCalledForPostNavigations() throws Throwable {
         // The reason POST requests are excluded is BUG 155250.
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         final TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
             contentsClient.getShouldOverrideUrlLoadingHelper();
 
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
         final String postLinkUrl = addPageToTestServer(mWebServer, "/page_with_post_link.html",
-                getHtmlForPageWithSimplePostFormTo(redirectTargetUrl));
+                CommonResources.makeHtmlPageWithSimplePostFormTo(redirectTargetUrl));
 
         loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), postLinkUrl);
 
         final int shouldOverrideUrlLoadingCallCount =
             shouldOverrideUrlLoadingHelper.getCallCount();
 
         assertEquals(0, mWebServer.getRequestCount(REDIRECT_TARGET_PATH));
         clickOnLinkUsingJs(awContents, contentsClient);
 
         // Wait for the target URL to be fetched from the server.
@@ skipping 18 matching lines @@
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         final TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
             contentsClient.getShouldOverrideUrlLoadingHelper();
 
         final String redirectTargetUrl = createRedirectTargetPage(mWebServer);
         final String postToGetRedirectUrl = mWebServer.setRedirect("/302.html", redirectTargetUrl);
         final String postLinkUrl = addPageToTestServer(mWebServer, "/page_with_post_link.html",
-                getHtmlForPageWithSimplePostFormTo(postToGetRedirectUrl));
+                CommonResources.makeHtmlPageWithSimplePostFormTo(postToGetRedirectUrl));
 
         loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), postLinkUrl);
 
         final int shouldOverrideUrlLoadingCallCount =
             shouldOverrideUrlLoadingHelper.getCallCount();
 
         clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
 
@@ skipping 78 matching lines @@
      * URL. We expect two callbacks - one for the redirect link and another for the destination.
      */
     private void doTestCalledOnRedirect(TestWebServer webServer,
             String redirectUrl, String redirectTarget) throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
             createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
         final String pageWithLinkToRedirectUrl = addPageToTestServer(webServer,
                 "/page_with_link_to_redirect.html",
-                getHtmlForPageWithSimpleLinkTo(redirectUrl));
+                CommonResources.makeHtmlPageWithSimpleLinkTo(redirectUrl));
         enableJavaScriptOnUiThread(awContents);
 
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
                 contentsClient.getShouldOverrideUrlLoadingHelper();
         int directLoadCallCount = shouldOverrideUrlLoadingHelper.getCallCount();
         loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), redirectUrl);
 
         shouldOverrideUrlLoadingHelper.waitForCallback(directLoadCallCount, 1);
         assertEquals(redirectTarget,
                 shouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
@@ skipping 90 matching lines @@
         TestAwContentsClient.ShouldOverrideUrlLoadingHelper shouldOverrideUrlLoadingHelper =
             contentsClient.getShouldOverrideUrlLoadingHelper();
 
         // Do a double navigagtion, the second being an effective no-op, in quick succession (i.e.
         // without yielding the main thread inbetween).
         int currentCallCount = contentsClient.getOnPageFinishedHelper().getCallCount();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 awContents.loadUrl(LoadUrlParams.createLoadDataParams(
-                        getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false));
+                        CommonResources.makeHtmlPageWithSimpleLinkTo(DATA_URL), "text/html",
+                        false));
                 awContents.loadUrl(new LoadUrlParams(jsUrl));
             }
         });
         contentsClient.getOnPageFinishedHelper().waitForCallback(currentCallCount, 1,
                 WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
 
         assertEquals(0, shouldOverrideUrlLoadingHelper.getCallCount());
     }
 }