content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.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/TestCallbackHelperContainer.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/test/android/javatests/src/org/chromium/content/browser/test/util/JavaScriptUtils.java ('k') | content/public/test/render_view_test.h » ('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/TestCallbackHelperContainer.java

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

index cfc53ffbfd24eb273f64cb90c52bc041ea70457b..d97e1ef9f72e18d4e5706d6dba25f977cfc05192 100644

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

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

@@ -126,7 +126,7 @@ public class TestCallbackHelperContainer {

* @param webContents A WebContents instance to be used.

* @param code A JavaScript code to be evaluated.

- public void evaluateJavaScript(WebContents webContents, String code) {

+ public void evaluateJavaScriptForTests(WebContents webContents, String code) {

JavaScriptCallback callback =

new JavaScriptCallback() {

@Override

@@ -134,12 +134,12 @@ public class TestCallbackHelperContainer {

notifyCalled(jsonResult);

}

};

- webContents.evaluateJavaScript(code, callback);

+ webContents.evaluateJavaScriptForTests(code, callback);

mJsonResult = null;

}

/**

- * Returns true if the evaluation started by evaluateJavaScript() has completed.

+ * Returns true if the evaluation started by evaluateJavaScriptForTests() has completed.

public boolean hasValue() {

return mJsonResult != null;