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

content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java

 // Copyright 2014 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.SmallTest;
 import android.text.TextUtils;
 import android.util.Pair;
 
 import org.chromium.base.test.util.UrlUtils;
-import org.chromium.content.browser.ContentViewCore.NavigationTransitionDelegate;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.content_public.browser.NavigationTransitionDelegate;
 import org.chromium.content_shell_apk.ContentShellActivity;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 import org.chromium.net.test.util.TestWebServer;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Test suite for navigation transition listeners.
@@ skipping 79 matching lines @@
      * the transition is handled.
      */
     @SmallTest
     public void testDidDeferAfterResponseStartedCalled() throws Throwable {
         ContentShellActivity activity = launchContentShellWithUrl(URL_1);
         waitForActiveShellToBeDoneLoading();
         ContentViewCore contentViewCore = activity.getActiveContentViewCore();
         TestCallbackHelperContainer testCallbackHelperContainer =
                 new TestCallbackHelperContainer(contentViewCore);
 
-        contentViewCore.setHasPendingNavigationTransitionForTesting();
+        contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
         TestNavigationTransitionDelegate delegate = new TestNavigationTransitionDelegate(
                 contentViewCore,
                 true);
-        contentViewCore.setNavigationTransitionDelegate(delegate);
+        contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
 
         loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_1));
 
         assertTrue("didDeferAfterResponseStarted called.", delegate.getDidCallDefer());
     }
 
     /**
      * Tests that the listener does not receive DidDeferAfterResponseStarted if we specify that
      * the transition is handled.
      */
     @SmallTest
     public void testDidDeferAfterResponseStartedNotCalled() throws Throwable {
         ContentShellActivity activity = launchContentShellWithUrl(URL_1);
         waitForActiveShellToBeDoneLoading();
         ContentViewCore contentViewCore = activity.getActiveContentViewCore();
         TestCallbackHelperContainer testCallbackHelperContainer =
                 new TestCallbackHelperContainer(contentViewCore);
 
-        contentViewCore.setHasPendingNavigationTransitionForTesting();
+        contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
         TestNavigationTransitionDelegate delegate = new TestNavigationTransitionDelegate(
                 contentViewCore,
                 false);
-        contentViewCore.setNavigationTransitionDelegate(delegate);
+        contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
 
         loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_1));
 
         assertFalse("didDeferAfterResponseStarted called.", delegate.getDidCallDefer());
     }
 
     /**
      * Tests that the resource handler doesn't query the listener if no transition is pending.
      */
     @SmallTest
     public void testWillHandleDeferAfterResponseStartedNotCalled() throws Throwable {
         ContentShellActivity activity = launchContentShellWithUrl(URL_1);
         waitForActiveShellToBeDoneLoading();
         ContentViewCore contentViewCore = activity.getActiveContentViewCore();
         TestCallbackHelperContainer testCallbackHelperContainer =
                 new TestCallbackHelperContainer(contentViewCore);
 
         TestNavigationTransitionDelegate delegate = new TestNavigationTransitionDelegate(
                 contentViewCore,
                 false);
-        contentViewCore.setNavigationTransitionDelegate(delegate);
+        contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
 
         loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_1));
 
         assertFalse("didDeferAfterResponseStarted called.", delegate.getDidCallDefer());
         assertFalse("willHandleDeferAfterResponseStarted called.",
                 delegate.getDidCallWillHandlerDefer());
     }
 
     /**
      * Tests that the listener receives addStylesheetToTransition if we specify
      * that there are entering transition stylesheet.
      */
     @SmallTest
     public void testAddStylesheetToTransitionCalled() throws Throwable {
         TestWebServer webServer = null;
         try {
           webServer = new TestWebServer(false);
 
           final String url2 = webServer.setResponse(URL_2, URL_2_DATA, null);
           ContentShellActivity activity = launchContentShellWithUrl(url2);
           waitForActiveShellToBeDoneLoading();
           ContentViewCore contentViewCore = activity.getActiveContentViewCore();
           TestCallbackHelperContainer testCallbackHelperContainer =
               new TestCallbackHelperContainer(contentViewCore);
-          contentViewCore.setHasPendingNavigationTransitionForTesting();
+          contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
           TestNavigationTransitionDelegate delegate =
               new TestNavigationTransitionDelegate(contentViewCore, true);
-          contentViewCore.setNavigationTransitionDelegate(delegate);
+          contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
 
           int currentCallCount = testCallbackHelperContainer
               .getOnPageFinishedHelper().getCallCount();
           String[] headers = {
               "link",
               "<transition0.css>;rel=transition-entering-stylesheet;scope=*",
               "link",
               "<transition1.css>;rel=transition-entering-stylesheet;scope=*",
               "link",
               "<transition2.css>;rel=transition-entering-stylesheet;scope=*"
@@ skipping 28 matching lines @@
         TestWebServer webServer = null;
         try {
           webServer = new TestWebServer(false);
 
           final String url2 = webServer.setResponse(URL_2, URL_2_DATA, null);
           ContentShellActivity activity = launchContentShellWithUrl(url2);
           waitForActiveShellToBeDoneLoading();
           ContentViewCore contentViewCore = activity.getActiveContentViewCore();
           TestCallbackHelperContainer testCallbackHelperContainer =
               new TestCallbackHelperContainer(contentViewCore);
-          contentViewCore.setHasPendingNavigationTransitionForTesting();
+          contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
           TestNavigationTransitionDelegate delegate =
               new TestNavigationTransitionDelegate(contentViewCore, true);
-          contentViewCore.setNavigationTransitionDelegate(delegate);
+          contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
 
           int currentCallCount = testCallbackHelperContainer
               .getOnPageFinishedHelper().getCallCount();
           final String url3 = webServer.setResponse(URL_3, URL_3_DATA, null);
           LoadUrlParams url3_params = new LoadUrlParams(url3);
           loadUrl(contentViewCore, testCallbackHelperContainer, url3_params);
           testCallbackHelperContainer.getOnPageFinishedHelper().waitForCallback(
               currentCallCount,
               1,
               10000,
@@ skipping 18 matching lines @@
         TestWebServer webServer = null;
         try {
             webServer = new TestWebServer(false);
 
             final String url2 = webServer.setResponse(URL_2, URL_2_DATA, null);
             ContentShellActivity activity = launchContentShellWithUrl(url2);
             waitForActiveShellToBeDoneLoading();
             ContentViewCore contentViewCore = activity.getActiveContentViewCore();
             TestCallbackHelperContainer testCallbackHelperContainer =
                     new TestCallbackHelperContainer(contentViewCore);
-            contentViewCore.setHasPendingNavigationTransitionForTesting();
+            contentViewCore.getWebContents().setHasPendingNavigationTransitionForTesting();
             TestNavigationTransitionDelegate delegate =
                     new TestNavigationTransitionDelegate(contentViewCore, true);
-            contentViewCore.setNavigationTransitionDelegate(delegate);
+            contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);
 
             String transitionEnteringColor = "#00FF00";
 
             int currentCallCount = testCallbackHelperContainer
                     .getOnPageFinishedHelper().getCallCount();
             String[] headers = {
                     "X-Transition-Entering-Color",
                     transitionEnteringColor,
             };
             final String url3 = webServer.setResponse(URL_3,
                     URL_3_DATA,
                     createHeadersList(headers));
             LoadUrlParams url3Params = new LoadUrlParams(url3);
             loadUrl(contentViewCore, testCallbackHelperContainer, url3Params);
             testCallbackHelperContainer.getOnPageFinishedHelper().waitForCallback(
                     currentCallCount,
                     1,
                     10000,
                     TimeUnit.MILLISECONDS);
 
             assertTrue("X-Transition-Entering-Color parsed correctly.",
                     TextUtils.equals(
                             delegate.getTransitionEnteringColor(),
                             transitionEnteringColor));
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 }