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: Fixed include order under flag and removed unwanted headers. 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

« no previous file with comments | « content/public/android/java/src/org/chromium/content_public/browser/WebContents.java ('k') | content/public/browser/web_contents.h » ('j') | content/public/browser/web_contents.h » ('J')
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 adfcf9e5bfe8df8b68df4be4e0e9f3b479b1d5a6..75358e08d2ec81e7ae3a182e8776da2f8bee9b03 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;

@@ -114,7 +114,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));

@@ -137,7 +137,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));

@@ -158,7 +158,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));

@@ -186,7 +186,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();

@@ -238,7 +238,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();

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

contentViewCore.setHasPendingNavigationTransitionForTesting();

TestNavigationTransitionDelegate delegate =

new TestNavigationTransitionDelegate(contentViewCore, true);

- contentViewCore.setNavigationTransitionDelegate(delegate);

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

String transitionEnteringColor = "#00FF00";