Removing ContentViewCore dependencies from direct WebContents functions.

content/public/android/javatests/src/org/chromium/content/browser/InterstitialPageTest.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 android.test.suitebuilder.annotation.LargeTest;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
@@ skipping 53 matching lines @@
 
     private boolean waitForInterstitial(final boolean shouldBeShown) throws InterruptedException {
         return CriteriaHelper.pollForCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 try {
                     return ThreadUtils.runOnUiThreadBlocking(new Callable<Boolean>() {
                         @Override
                         public Boolean call() throws Exception {
                             return shouldBeShown
-                                    == getContentViewCore().isShowingInterstitialPage();
+                                    == getWebContents().isShowingInterstitialPage();
                         }
                     });
                 } catch (ExecutionException e) {
                     return false;
                 }
             }
         });
     }
 
     /**
@@ skipping 23 matching lines @@
             @Override
             protected void commandReceived(String command) {
                 assertEquals(command, proceedCommand);
                 proceed();
             }
         };
         TestWebContentsObserverAndroid observer = ThreadUtils.runOnUiThreadBlocking(
                 new Callable<TestWebContentsObserverAndroid>() {
                     @Override
                     public TestWebContentsObserverAndroid call() throws Exception {
-                        getContentViewCore().showInterstitialPage(URL, delegate);
-                        return new TestWebContentsObserverAndroid(
-                                getContentViewCore().getWebContents());
+                        getWebContents().showInterstitialPage(URL, delegate.getNative());
+                        return new TestWebContentsObserverAndroid(getWebContents());
                     }
                 });
 
         assertTrue("Interstitial never shown.", waitForInterstitial(true));
         assertTrue("WebContentsObserver not notified of interstitial showing",
                 observer.isInterstitialShowing());
         TouchCommon touchCommon = new TouchCommon(this);
         touchCommon.singleClickViewRelative(getContentViewCore().getContainerView(), 10, 10);
         assertTrue("Interstitial never hidden.", waitForInterstitial(false));
         assertTrue("WebContentsObserver not notified of interstitial hiding",
                 !observer.isInterstitialShowing());
     }
 }