Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

 // Copyright 2013 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.chrome.browser.test;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
@@ skipping 166 matching lines @@
         loadUrlWithSanitization(BEFORE_UNLOAD_URL);
         executeJavaScriptAndWaitForDialog("history.back();");
 
         JavascriptAppModalDialog jsDialog = getCurrentDialog();
         assertNotNull("No dialog showing.", jsDialog);
         checkButtonPresenceVisibilityText(
                 jsDialog, 0, org.chromium.chrome.R.string.stay_on_this_page,
                 "Stay on this page");
         clickCancel(jsDialog);
 
-        assertEquals(BEFORE_UNLOAD_URL, getActivity().getActiveContentViewCore().getUrl());
+        assertEquals(BEFORE_UNLOAD_URL, getActivity().getActiveContentViewCore()
+                .getWebContents().getUrl());
         executeJavaScriptAndWaitForDialog("history.back();");
 
         jsDialog = getCurrentDialog();
         assertNotNull("No dialog showing.", jsDialog);
         checkButtonPresenceVisibilityText(
                 jsDialog, 2, org.chromium.chrome.R.string.leave_this_page,
                 "Leave this page");
 
         final TestCallbackHelperContainer.OnPageFinishedHelper onPageLoaded =
                 getActiveTabTestCallbackHelperContainer().getOnPageFinishedHelper();
         int callCount = onPageLoaded.getCallCount();
         clickOk(jsDialog);
         onPageLoaded.waitForCallback(callCount);
-        assertEquals(EMPTY_PAGE, getActivity().getActiveContentViewCore().getUrl());
+        assertEquals(EMPTY_PAGE, getActivity().getActiveContentViewCore()
+                .getWebContents().getUrl());
     }
 
     /**
      * Verifies that when showing a beforeunload dialogs as a result of a page
      * reload, the correct UI strings are used.
      */
     @MediumTest
     @Feature({"Browser", "Main"})
     public void testBeforeUnloadOnReloadDialog()
             throws InterruptedException, TimeoutException, ExecutionException {
@@ skipping 194 matching lines @@
                 button.getVisibility());
         assertEquals("'" + readableName + "' button has wrong text",
                 getActivity().getResources().getString(expectedTextResourceId),
                 button.getText().toString());
     }
 
     private TestCallbackHelperContainer getActiveTabTestCallbackHelperContainer() {
         return new TestCallbackHelperContainer(getActivity().getActiveTab().getContentViewCore());
     }
 }