[android_webview] Use AwContents loadUrl method instead of ContentViewCore.

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

 // Copyright (c) 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.os.Bundle;
 import android.os.SystemClock;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 import android.view.MotionEvent;
 import android.util.Log;
 
+import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageStartedHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnReceivedErrorHelper;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
@@ skipping 57 matching lines @@
         public TestAwContentsClient() {
             super();
             mShouldIgnoreNavigationHelper = new ShouldIgnoreNavigationHelper();
         }
 
         public ShouldIgnoreNavigationHelper getShouldIgnoreNavigationHelper() {
             return mShouldIgnoreNavigationHelper;
         }
     }
 
-    private void clickOnLinkUsingJs(final ContentViewCore contentViewCore,
+    private void clickOnLinkUsingJs(final AwContents awContents,
             final TestAwContentsClient contentsClient) throws Throwable {
-        enableJavaScriptOnUiThread(contentViewCore);
+        enableJavaScriptOnUiThread(awContents);
 
         assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 try {
-                    String linkIsNotNull = executeJavaScriptAndWaitForResult(contentViewCore,
+                    String linkIsNotNull = executeJavaScriptAndWaitForResult(awContents,
                         contentsClient, "document.getElementById('link') != null");
                     return linkIsNotNull.equals("true");
                 } catch (Throwable t) {
                     t.printStackTrace();
                     fail("Failed to check if DOM is loaded: " + t.toString());
                     return false;
                 }
             }
         }, WAIT_TIMEOUT_SECONDS * 1000, CHECK_INTERVAL));
 
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                contentViewCore.evaluateJavaScript(
+                awContents.getContentViewCore().evaluateJavaScript(
                     "var evObj = document.createEvent('Events'); " +
                     "evObj.initEvent('click', true, false); " +
                     "document.getElementById('link').dispatchEvent(evObj);" +
                     "console.log('element with id link clicked');");
             }
         });
     }
 
     // Since this value is read on the UI thread, it's simpler to set it there too.
     void setShouldIgnoreNavigationReturnValueOnUiThread(
@@ skipping 74 matching lines @@
     }
 
     /**
      * @SmallTest
      * @Feature({"Android-WebView", "Navigation"})
      * BUG=154558
      */
     @DisabledTest
     public void testShouldIgnoreNavigationNotCalledOnLoadUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
             contentsClient.getShouldIgnoreNavigationHelper();
 
-        loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+        loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
         assertEquals(0, shouldIgnoreNavigationHelper.getCallCount());
     }
 
     /**
      * @SmallTest
      * @Feature({"Android-WebView", "Navigation"})
      * BUG=154558
      */
     @DisabledTest
     public void testShouldIgnoreNavigationCantBlockLoads() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
             contentsClient.getShouldIgnoreNavigationHelper();
 
         setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, true);
 
-        loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+        loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
-        assertEquals("Title", getTitleOnUiThread(contentViewCore));
+        assertEquals("Title", getTitleOnUiThread(awContents));
     }
 
     /**
      * @SmallTest
      * @Feature({"Android-WebView", "Navigation"})
      * BUG=154292
      */
     @DisabledTest
     public void testShouldIgnoreNavigationCalledBeforeOnPageStarted() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
             contentsClient.getShouldIgnoreNavigationHelper();
         OnPageStartedHelper onPageStartedHelper = contentsClient.getOnPageStartedHelper();
 
-        loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+        loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
         final int shouldIgnoreNavigationCallCount = shouldIgnoreNavigationHelper.getCallCount();
         final int onPageStartedCallCount = onPageStartedHelper.getCallCount();
         setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, true);
-        clickOnLinkUsingJs(contentViewCore, contentsClient);
+        clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldIgnoreNavigationHelper.waitForCallback(shouldIgnoreNavigationCallCount);
         assertEquals(onPageStartedCallCount, onPageStartedHelper.getCallCount());
     }
 
 
     /**
      * @SmallTest
      * @Feature({"Android-WebView", "Navigation"})
      * BUG=154292
      */
     @DisabledTest
     public void testShouldIgnoreNavigationDoesNotCauseOnReceivedError() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         final TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
             contentsClient.getShouldIgnoreNavigationHelper();
         OnReceivedErrorHelper onReceivedErrorHelper = contentsClient.getOnReceivedErrorHelper();
         final int onReceivedErrorCallCount = onReceivedErrorHelper.getCallCount();
 
-        loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+        loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
         final int shouldIgnoreNavigationCallCount = shouldIgnoreNavigationHelper.getCallCount();
 
         setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, true);
 
-        clickOnLinkUsingJs(contentViewCore, contentsClient);
+        clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldIgnoreNavigationHelper.waitForCallback(shouldIgnoreNavigationCallCount);
 
         setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, false);
 
         // After we load this URL we're certain that any in-flight callbacks for the previous
         // navigation have been delivered.
-        loadUrlSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), ABOUT_BLANK_URL);
+        loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), ABOUT_BLANK_URL);
 
         assertEquals(onReceivedErrorCallCount, onReceivedErrorHelper.getCallCount());
     }
 
 
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledWhenLinkClicked() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
                 contentsClient.getShouldIgnoreNavigationHelper();
 
         // We can't go to about:blank from here because we'd get a cross-origin error.
-        loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+        loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 getHtmlForPageWithSimpleLinkTo(DATA_URL), "text/html", false);
 
         int callCount = shouldIgnoreNavigationHelper.getCallCount();
 
-        clickOnLinkUsingJs(contentViewCore, contentsClient);
+        clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldIgnoreNavigationHelper.waitForCallback(callCount);
     }
 
 
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledWhenSelfLinkClicked() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
                 contentsClient.getShouldIgnoreNavigationHelper();
 
         TestWebServer webServer = null;
         try {
             // Set up the HTML page.
             webServer = new TestWebServer(false);
             final String httpPath = "/page_with_link_to_self.html";
             final String httpPathOnServer = webServer.getResponseUrl(httpPath);
             addPageToTestServer(webServer, httpPath,
                     getHtmlForPageWithSimpleLinkTo(httpPathOnServer));
 
-            loadUrlSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+            loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
                     httpPathOnServer);
 
             int callCount = shouldIgnoreNavigationHelper.getCallCount();
 
-            clickOnLinkUsingJs(contentViewCore, contentsClient);
+            clickOnLinkUsingJs(awContents, contentsClient);
 
             shouldIgnoreNavigationHelper.waitForCallback(callCount);
             assertEquals(httpPathOnServer,
                     shouldIgnoreNavigationHelper.getShouldIgnoreNavigationUrl());
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledWhenNavigatingFromJavaScriptUsingAssign()
             throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
-        enableJavaScriptOnUiThread(contentViewCore);
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        enableJavaScriptOnUiThread(awContents);
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
                 contentsClient.getShouldIgnoreNavigationHelper();
 
         TestWebServer webServer = null;
         try {
             // Set up the HTML page.
             webServer = new TestWebServer(false);
             final String redirectTargetUrl = createRedirectTargetPage(webServer);
-            loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+            loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                     getHtmlForPageWithJsAssignLinkTo(redirectTargetUrl), "text/html", false);
 
             int callCount = shouldIgnoreNavigationHelper.getCallCount();
 
-            clickOnLinkUsingJs(contentViewCore, contentsClient);
+            clickOnLinkUsingJs(awContents, contentsClient);
 
             shouldIgnoreNavigationHelper.waitForCallback(callCount);
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledWhenNavigatingFromJavaScriptUsingReplace()
             throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
-        enableJavaScriptOnUiThread(contentViewCore);
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        enableJavaScriptOnUiThread(awContents);
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
                 contentsClient.getShouldIgnoreNavigationHelper();
 
         TestWebServer webServer = null;
         try {
             // Set up the HTML page.
             webServer = new TestWebServer(false);
             final String redirectTargetUrl = createRedirectTargetPage(webServer);
-            loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+            loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                     getHtmlForPageWithJsReplaceLinkTo(redirectTargetUrl), "text/html", false);
 
             int callCount = shouldIgnoreNavigationHelper.getCallCount();
-            clickOnLinkUsingJs(contentViewCore, contentsClient);
+            clickOnLinkUsingJs(awContents, contentsClient);
             shouldIgnoreNavigationHelper.waitForCallback(callCount);
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testShouldIgnoreNavigationPassesCorrectUrl() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
                 contentsClient.getShouldIgnoreNavigationHelper();
 
         TestWebServer webServer = null;
         try {
             // Set up the HTML page.
             webServer = new TestWebServer(false);
             final String redirectTargetUrl = createRedirectTargetPage(webServer);
-            loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+            loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                     getHtmlForPageWithSimpleLinkTo(redirectTargetUrl), "text/html", false);
 
             int callCount = shouldIgnoreNavigationHelper.getCallCount();
-            clickOnLinkUsingJs(contentViewCore, contentsClient);
+            clickOnLinkUsingJs(awContents, contentsClient);
             shouldIgnoreNavigationHelper.waitForCallback(callCount);
             assertEquals(redirectTargetUrl,
                     shouldIgnoreNavigationHelper.getShouldIgnoreNavigationUrl());
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testShouldIgnoreNavigationCanOverrideLoading() throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         final TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
                 contentsClient.getShouldIgnoreNavigationHelper();
 
         TestWebServer webServer = null;
         try {
             // Set up the HTML page.
             webServer = new TestWebServer(false);
             final String redirectTargetUrl = createRedirectTargetPage(webServer);
-            loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+            loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                     getHtmlForPageWithSimpleLinkTo(redirectTargetUrl), "text/html", false);
 
             setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, true);
 
             OnPageFinishedHelper onPageFinishedHelper = contentsClient.getOnPageFinishedHelper();
             int onPageFinishedCountBeforeClickingOnLink = onPageFinishedHelper.getCallCount();
             int callCount = shouldIgnoreNavigationHelper.getCallCount();
-            clickOnLinkUsingJs(contentViewCore, contentsClient);
+            clickOnLinkUsingJs(awContents, contentsClient);
             // Some time around here true should be returned from the shouldIgnoreNavigation
             // callback causing the navigation caused by calling clickOnLinkUsingJs to be ignored.
             // We validate this by indirectly checking that an onPageFinished callback was not
             // issued after this point.
             shouldIgnoreNavigationHelper.waitForCallback(callCount);
 
             setShouldIgnoreNavigationReturnValueOnUiThread(shouldIgnoreNavigationHelper, false);
 
             final String synchronizationUrl = ABOUT_BLANK_URL;
-            loadUrlSync(contentViewCore, onPageFinishedHelper, synchronizationUrl);
+            loadUrlSync(awContents, onPageFinishedHelper, synchronizationUrl);
 
             assertEquals(synchronizationUrl, onPageFinishedHelper.getUrl());
             assertEquals(onPageFinishedHelper.getCallCount(),
                     onPageFinishedCountBeforeClickingOnLink + 1);
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testShouldIgnoreNavigationCalledForDataUrl() throws Throwable {
         final String dataUrl =
                 "data:text/html;base64," +
                 "PGh0bWw+PGhlYWQ+PHRpdGxlPmRhdGFVcmxUZXN0QmFzZTY0PC90aXRsZT48" +
                 "L2hlYWQ+PC9odG1sPg==";
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
                 contentsClient.getShouldIgnoreNavigationHelper();
-        loadDataSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+        loadDataSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 getHtmlForPageWithSimpleLinkTo(dataUrl), "text/html", false);
 
         int callCount = shouldIgnoreNavigationHelper.getCallCount();
-        clickOnLinkUsingJs(contentViewCore, contentsClient);
+        clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldIgnoreNavigationHelper.waitForCallback(callCount);
         assertTrue("Expected URL that starts with 'data:' but got: <" +
                    shouldIgnoreNavigationHelper.getShouldIgnoreNavigationUrl() + "> instead.",
                    shouldIgnoreNavigationHelper.getShouldIgnoreNavigationUrl().startsWith(
                            "data:"));
     }
 
     // The +1 comes from the fact that we call shouldIgnoreNavigation for URLs that were passed
     // to the .loadUrl method.
     // See BUG=154558.
     private int adjustForBug154558(int callCount) {
         return callCount + 1;
     }
 
     /**
      * Worker method for the various redirect tests.
      *
      * Calling this will first load the redirect URL built from redirectFilePath, query and
      * locationFilePath and assert that we get a override callback for the destination.
      * The second part of the test loads a page that contains a link which points at the redirect
      * URL. We expect two callbacks - one for the redirect link and another for the destination.
      */
     private void doTestShouldIgnoreNavigationCalledOnRedirect(TestWebServer webServer,
             String redirectUrl, String redirectTarget) throws Throwable {
         final TestAwContentsClient contentsClient = new TestAwContentsClient();
-        final ContentViewCore contentViewCore =
-            createAwTestContainerViewOnMainSync(contentsClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+            createAwTestContainerViewOnMainSync(contentsClient);
+        final AwContents awContents = testContainerView.getAwContents();
         final String pageWithLinkToRedirectUrl = addPageToTestServer(webServer,
                 "/page_with_link_to_redirect.html",
                 getHtmlForPageWithSimpleLinkTo(redirectUrl));
-        enableJavaScriptOnUiThread(contentViewCore);
+        enableJavaScriptOnUiThread(awContents);
 
         TestAwContentsClient.ShouldIgnoreNavigationHelper shouldIgnoreNavigationHelper =
                 contentsClient.getShouldIgnoreNavigationHelper();
         int directLoadCallCount = shouldIgnoreNavigationHelper.getCallCount();
-        loadUrlSync(contentViewCore, contentsClient.getOnPageFinishedHelper(), redirectUrl);
+        loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), redirectUrl);
 
         shouldIgnoreNavigationHelper.waitForCallback(directLoadCallCount, adjustForBug154558(1));
         assertEquals(redirectTarget,
                 shouldIgnoreNavigationHelper.getShouldIgnoreNavigationUrl());
 
         // There is a slight difference between navigations caused by calling load and navigations
         // caused by clicking on a link:
         //  * when using load the navigation is treated as if it came from the URL bar (has the
         //    navigation type TYPED and doesn't have the has_user_gesture flag)
         //  * when clicking on a link the navigation has the LINK type and has_user_gesture is
         //    true.
         // Both of these should yield the same result which is what we're verifying here.
         int indirectLoadCallCount = shouldIgnoreNavigationHelper.getCallCount();
-        loadUrlSync(contentViewCore, contentsClient.getOnPageFinishedHelper(),
+        loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(),
                 pageWithLinkToRedirectUrl);
 
         // We waitForCallback here because we call shouldIgnoreNavigation for URLs that were passed
         // to the .loadUrl method. See BUG=154558.
         // Do this when the bug is fixed:
         // assertEquals(indirectLoadCallCount, shouldIgnoreNavigationHelper.getCallCount());
         shouldIgnoreNavigationHelper.waitForCallback(indirectLoadCallCount, 1);
 
-        clickOnLinkUsingJs(contentViewCore, contentsClient);
+        clickOnLinkUsingJs(awContents, contentsClient);
 
         shouldIgnoreNavigationHelper.waitForCallback(indirectLoadCallCount, adjustForBug154558(2));
 
         assertEquals(redirectTarget,
                 shouldIgnoreNavigationHelper.getShouldIgnoreNavigationUrl());
         assertEquals(redirectUrl,
                 shouldIgnoreNavigationHelper.getPreviousShouldIgnoreNavigationUrl());
     }
 
     @SmallTest
@@ skipping 96 matching lines @@
             final String redirectTargetUrl = createRedirectTargetPage(webServer);
             final String redirectUrl = addPageToTestServer(webServer, "/js_delayed_replace.html",
                     getHtmlForPageWithJsRedirectTo(redirectTargetUrl, "Replace", 100));
             doTestShouldIgnoreNavigationCalledOnRedirect(webServer, redirectUrl,
                     redirectTargetUrl);
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 }