content/public/android/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.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/TestsJavaScriptEvalTest.java

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

Patch Set: Fixed nits. 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

« content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.java ('K') | « content/public/android/javatests/src/org/chromium/content/browser/PostMessageTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/TransitionTest.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/TestsJavaScriptEvalTest.java

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

index dc61d4cf71e25231e03d9ff73014f780f3a04e37..99c14c6cf545fc016c1e34a18bf2bd49cbe1bf76 100644

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

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

@@ -9,8 +9,12 @@ import android.test.suitebuilder.annotation.LargeTest;

import org.chromium.base.test.util.Feature;

import org.chromium.base.test.util.UrlUtils;

import org.chromium.content.browser.test.util.DOMUtils;

+import org.chromium.content_public.browser.WebContents;

import org.chromium.content_shell_apk.ContentShellTestBase;

+/**

+ * Integration tests for JavaScript execution.

+ */

public class TestsJavaScriptEvalTest extends ContentShellTestBase {

private static final String JSTEST_URL = UrlUtils.encodeHtmlDataUri(

"<html><head><script>" +

@@ -32,15 +36,15 @@ public class TestsJavaScriptEvalTest extends ContentShellTestBase {

launchContentShellWithUrl(JSTEST_URL);

assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());

- final ContentViewCore contentViewCore = getContentViewCore();

+ final WebContents webContents = getWebContents();

for (int i = 0; i < 30; ++i) {

for (int j = 0; j < 10; ++j) {

// Start evaluation of a JavaScript script -- we don't need a result.

- contentViewCore.evaluateJavaScript("foobar();", null);

+ webContents.evaluateJavaScript("foobar();", null);

}

// DOMUtils does need to evaluate a JavaScript and get its result to get DOM bounds.

assertNotNull("Failed to get bounds",

- DOMUtils.getNodeBounds(contentViewCore, "test"));

+ DOMUtils.getNodeBounds(webContents, "test"));

}