chrome/android/javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java - Issue 1258593002: Reland "Add ExecuteJavaScriptForTest and make all tests use it"

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: chrome/android/javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java

Issue 1258593002: Reland "Add ExecuteJavaScriptForTest and make all tests use it" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 5 years, 5 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 | « android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/ModalDialogTest.java » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java

index ca686b8ef27c5328ee0da3bd6a03d40f38332cf6..9581ec68199e1613608a56e540538604fb5d0796 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/JavaScriptEvalChromeTest.java

@@ -55,8 +55,8 @@ public class JavaScriptEvalChromeTest extends ChromeTabbedActivityTestBase {

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

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

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

- tab1.getWebContents().evaluateJavaScript("foobar();", null);

- tab2.getWebContents().evaluateJavaScript("foobar();", null);

+ tab1.getWebContents().evaluateJavaScriptForTests("foobar();", null);

+ tab2.getWebContents().evaluateJavaScriptForTests("foobar();", null);

}

assertEquals("Incorrect JavaScript evaluation result on tab1",

i * 2,

@@ -65,8 +65,8 @@ public class JavaScriptEvalChromeTest extends ChromeTabbedActivityTestBase {

tab1.getWebContents(), "add2()")));