Removing ContentViewCore dependencies from direct WebContents functions.

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.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.android_webview.test;
 
 import android.test.suitebuilder.annotation.MediumTest;
 
 import junit.framework.Assert;
 
 import org.chromium.android_webview.test.util.JavascriptEventObserver;
 import org.chromium.android_webview.test.util.VideoTestWebServer;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.TouchCommon;
+import org.chromium.content_public.browser.WebContents;
 
 /**
  * Test WebChromeClient::onShow/HideCustomView.
  */
 public class AwContentsClientFullScreenVideoTest extends AwTestBase {
     private FullScreenVideoTestAwContentsClient mContentsClient;
     private ContentViewCore mContentViewCore;
+    private WebContents mWebContents;
     private VideoTestWebServer mWebServer;
     private AwTestContainerView mTestContainerView;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mContentsClient = new FullScreenVideoTestAwContentsClient(getActivity());
         mTestContainerView =
                 createAwTestContainerViewOnMainSync(mContentsClient);
         mContentViewCore = mTestContainerView.getContentViewCore();
+        mWebContents = mTestContainerView.getAwContents().getWebContents();
         enableJavaScriptOnUiThread(mTestContainerView.getAwContents());
         mTestContainerView.getAwContents().getSettings().setFullscreenSupported(true);
         mWebServer = new VideoTestWebServer(
                 getInstrumentation().getTargetContext());
     }
 
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         if (mWebServer != null) mWebServer.getTestWebServer().shutdown();
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnShowAndHideCustomViewWithCallback() throws Throwable {
         doOnShowAndHideCustomViewTest(new Runnable() {
             @Override
             public void run() {
                 mContentsClient.getExitCallback().onCustomViewHidden();
             }
         });
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnShowAndHideCustomViewWithJavascript() throws Throwable {
         doOnShowAndHideCustomViewTest(new Runnable() {
             @Override
             public void run() {
-                DOMUtils.exitFullscreen(mContentViewCore);
+                DOMUtils.exitFullscreen(mWebContents);
             }
         });
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnShowCustomViewAndPlayWithHtmlControl() throws Throwable {
         doOnShowCustomViewTest();
-        Assert.assertFalse(DOMUtils.hasVideoEnded(
-                mContentViewCore, VideoTestWebServer.VIDEO_ID));
+        Assert.assertFalse(DOMUtils.hasVideoEnded(mWebContents, VideoTestWebServer.VIDEO_ID));
 
         // Click the html play button that is rendered above the video right in the middle
         // of the custom view. Note that we're not able to get the precise location of the
         // control since it is a shadow element, so this test might break if the location
         // ever moves.
         TouchCommon touchCommon = new TouchCommon(
                 AwContentsClientFullScreenVideoTest.this);
         touchCommon.singleClickView(mContentsClient.getCustomView());
 
-        Assert.assertTrue(DOMUtils.waitForEndOfVideo(
-                mContentViewCore, VideoTestWebServer.VIDEO_ID));
+        Assert.assertTrue(DOMUtils.waitForEndOfVideo(mWebContents, VideoTestWebServer.VIDEO_ID));
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testFullscreenNotSupported() throws Throwable {
         mTestContainerView.getAwContents().getSettings().setFullscreenSupported(false);
 
         final JavascriptEventObserver fullScreenErrorObserver = new JavascriptEventObserver();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
@@ skipping 23 matching lines @@
     private void loadTestPageAndClickFullscreen() throws Exception {
         loadUrlSync(mTestContainerView.getAwContents(),
                 mContentsClient.getOnPageFinishedHelper(),
                 mWebServer.getFullScreenVideoTestURL());
 
         // Click the button in full_screen_video_test.html to enter fullscreen.
         TouchCommon touchCommon = new TouchCommon(this);
         touchCommon.singleClickView(mTestContainerView);
     }
 }