Removing ContentViewCore dependencies from direct WebContents functions.

content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.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.content.browser;
 
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.net.Uri;
 
@@ skipping 49 matching lines @@
      * Scrolls to the node with the provided id, taps on it and waits for an intent to come.
      * @param id Id of the node to scroll and tap.
      * @return The content url of the received intent or null if none.
      */
     protected String scrollAndTapExpectingIntent(String id) throws Throwable {
         TestCallbackHelperContainer callbackHelperContainer = getTestCallbackHelperContainer();
         OnStartContentIntentHelper onStartContentIntentHelper =
                 callbackHelperContainer.getOnStartContentIntentHelper();
         int currentCallCount = onStartContentIntentHelper.getCallCount();
 
-        DOMUtils.scrollNodeIntoView(getContentViewCore(), id);
+        DOMUtils.scrollNodeIntoView(getWebContents(), id);
         DOMUtils.clickNode(this, getContentViewCore(), id);
 
         onStartContentIntentHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
                 TimeUnit.SECONDS);
         getInstrumentation().waitForIdleSync();
         return onStartContentIntentHelper.getIntentUrl();
     }
 
     /**
      * Scrolls to the node with the provided id, taps on it and waits for a new page load to finish.
      * Useful when tapping on links that take to other pages.
      * @param id Id of the node to scroll and tap.
      * @return The content url of the received intent or null if none.
      */
     protected void scrollAndTapNavigatingOut(String id) throws Throwable {
         TestCallbackHelperContainer callbackHelperContainer = getTestCallbackHelperContainer();
         OnPageFinishedHelper onPageFinishedHelper =
                 callbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
 
-        DOMUtils.scrollNodeIntoView(getContentViewCore(), id);
+        DOMUtils.scrollNodeIntoView(getWebContents(), id);
         DOMUtils.clickNode(this, getContentViewCore(), id);
 
         onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,
                 TimeUnit.SECONDS);
         getInstrumentation().waitForIdleSync();
     }
 }