content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.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: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.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

« content/browser/frame_host/render_frame_host_impl.cc ('K') | « content/public/browser/render_frame_host.h ('k') | content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

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

index 42457ccb7de1d0874c819e5868618343663009b1..75cd2e9ac96935873a365a635a3c621e09f53ea1 100644

--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java

@@ -50,7 +50,7 @@ public class JavaScriptUtils {

ThreadUtils.runOnUiThread(new Runnable() {

@Override

public void run() {

- helper.evaluateJavaScript(webContents, code);

+ helper.evaluateJavaScriptForTests(webContents, code);

}

});

helper.waitUntilHasValue(timeout, timeoutUnits);

@@ -65,7 +65,7 @@ public class JavaScriptUtils {

ThreadUtils.runOnUiThread(new Runnable() {

@Override

public void run() {

- webContents.evaluateJavaScript(code, null);

+ webContents.evaluateJavaScriptForTests(code, null);

}

});

}