content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionTestBase.java - Issue 572013002: Removing ContentViewCore dependencies from direct WebContents functions.

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/ContentDetectionTestBase.java

Issue 572013002: Removing ContentViewCore dependencies from direct WebContents functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased the patch and addressed review comments. Created 6 years, 2 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/browser/accessibility/JellyBeanAccessibilityInjector.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 870536f6991df8c0b4910fcedfb39d782960611c..455fe00d1f0122d309dd79d5476e43ac4fdbdb25 100644

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

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

@@ -67,7 +67,7 @@ public class ContentDetectionTestBase extends ContentShellTestBase {

callbackHelperContainer.getOnStartContentIntentHelper();

int currentCallCount = onStartContentIntentHelper.getCallCount();

- DOMUtils.scrollNodeIntoView(getContentViewCore(), id);

+ DOMUtils.scrollNodeIntoView(getWebContents(), id);

DOMUtils.clickNode(this, getContentViewCore(), id);

onStartContentIntentHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,

@@ -88,7 +88,7 @@ public class ContentDetectionTestBase extends ContentShellTestBase {

callbackHelperContainer.getOnPageFinishedHelper();

int currentCallCount = onPageFinishedHelper.getCallCount();

- DOMUtils.scrollNodeIntoView(getContentViewCore(), id);

+ DOMUtils.scrollNodeIntoView(getWebContents(), id);

DOMUtils.clickNode(this, getContentViewCore(), id);

onPageFinishedHelper.waitForCallback(currentCallCount, 1, WAIT_TIMEOUT_SECONDS,