content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java - Issue 2380743003: Refactor ContentViewClient (2/6)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2380743003: Refactor ContentViewClient (2/6) (Closed)

Patch Set: tests Created 4 years, 3 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/public/android/java/src/org/chromium/content/browser/ContentViewCore.java ('K') | « content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeTestBase.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java » ('j') | content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 99d6ca9fc465e1aaab4c736e974ddf83455d0bff..e4c56061d98c4717837952d1d307c1d56a9f98ad 100644

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

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

@@ -64,7 +64,7 @@ public class NavigationTest extends ContentShellTestBase {

NavigationController navigationController = contentViewCore.getWebContents()

.getNavigationController();

TestCallbackHelperContainer testCallbackHelperContainer =

- new TestCallbackHelperContainer(contentViewCore);

+ new TestCallbackHelperContainer(getWindowAndroid(), contentViewCore);

loadUrl(navigationController, testCallbackHelperContainer, new LoadUrlParams(URL_2));

loadUrl(navigationController, testCallbackHelperContainer, new LoadUrlParams(URL_3));

@@ -116,7 +116,7 @@ public class NavigationTest extends ContentShellTestBase {

waitForActiveShellToBeDoneLoading();

ContentViewCore contentViewCore = activity.getActiveContentViewCore();

TestCallbackHelperContainer testCallbackHelperContainer =

- new TestCallbackHelperContainer(contentViewCore);

+ new TestCallbackHelperContainer(getWindowAndroid(), contentViewCore);

OnEvaluateJavaScriptResultHelper javascriptHelper = new OnEvaluateJavaScriptResultHelper();

// Grab the first timestamp.