content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java - Issue 414423002: Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents

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

Issue 414423002: Removing ContentViewCore dependencies from few functions which acts as direct wrapper to WebContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Formatted native file changes to correct inclusion order. Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/web_contents/web_contents_impl.cc ('K') | « content/public/android/java/src/org/chromium/content_public/browser/WebContents.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.java

index 6e84b75e67a5d893deacf0fe9a8cec1abc142fc1..4962350feda5a68e3e3b2442310cd9af93289c24 100644

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

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

@@ -9,8 +9,8 @@ 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;

@@ -113,7 +113,7 @@ public class TransitionTest extends ContentShellTestBase {

TestNavigationTransitionDelegate delegate = new TestNavigationTransitionDelegate(

contentViewCore,

true);

- contentViewCore.setNavigationTransitionDelegate(delegate);

+ contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);

loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_1));

@@ -136,7 +136,7 @@ public class TransitionTest extends ContentShellTestBase {

TestNavigationTransitionDelegate delegate = new TestNavigationTransitionDelegate(

contentViewCore,

false);

- contentViewCore.setNavigationTransitionDelegate(delegate);

+ contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);

loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_1));

@@ -157,7 +157,7 @@ public class TransitionTest extends ContentShellTestBase {

TestNavigationTransitionDelegate delegate = new TestNavigationTransitionDelegate(

contentViewCore,

false);

- contentViewCore.setNavigationTransitionDelegate(delegate);

+ contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);

loadUrl(contentViewCore, testCallbackHelperContainer, new LoadUrlParams(URL_1));

@@ -185,7 +185,7 @@ public class TransitionTest extends ContentShellTestBase {

contentViewCore.setHasPendingNavigationTransitionForTesting();

TestNavigationTransitionDelegate delegate =

new TestNavigationTransitionDelegate(contentViewCore, true);

- contentViewCore.setNavigationTransitionDelegate(delegate);

+ contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);

int currentCallCount = testCallbackHelperContainer

.getOnPageFinishedHelper().getCallCount();

@@ -237,7 +237,7 @@ public class TransitionTest extends ContentShellTestBase {

contentViewCore.setHasPendingNavigationTransitionForTesting();

TestNavigationTransitionDelegate delegate =

new TestNavigationTransitionDelegate(contentViewCore, true);

- contentViewCore.setNavigationTransitionDelegate(delegate);

+ contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);

int currentCallCount = testCallbackHelperContainer

.getOnPageFinishedHelper().getCallCount();

@@ -279,7 +279,7 @@ public class TransitionTest extends ContentShellTestBase {

contentViewCore.setHasPendingNavigationTransitionForTesting();

TestNavigationTransitionDelegate delegate =

new TestNavigationTransitionDelegate(contentViewCore, true);

- contentViewCore.setNavigationTransitionDelegate(delegate);

+ contentViewCore.getWebContents().setNavigationTransitionDelegate(delegate);

String transitionEnteringColor = "#00FF00";