chrome/browser/ui/webui/web_ui_test_handler.cc - Issue 1123783002: 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/browser/ui/webui/web_ui_test_handler.cc

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

Patch Set: rebase 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 | « chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc ('k') | chrome/renderer/autofill/autofill_renderer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/web_ui_test_handler.cc

diff --git a/chrome/browser/ui/webui/web_ui_test_handler.cc b/chrome/browser/ui/webui/web_ui_test_handler.cc

index 8cf270e574cef94e3631fbfee1049c300d0b1dab..d4e03aabba7aa0e4ab592b4240a8a8ca67d6bae6 100644

--- a/chrome/browser/ui/webui/web_ui_test_handler.cc

+++ b/chrome/browser/ui/webui/web_ui_test_handler.cc

@@ -37,7 +37,8 @@ void WebUITestHandler::PreloadJavaScript(const base::string16& js_text,

}

void WebUITestHandler::RunJavaScript(const base::string16& js_text) {

- web_ui()->GetWebContents()->GetMainFrame()->ExecuteJavaScript(js_text);

+ web_ui()->GetWebContents()->GetMainFrame()->ExecuteJavaScriptForTests(

+ js_text);

}

bool WebUITestHandler::RunJavaScriptTestWithResult(

@@ -45,9 +46,9 @@ bool WebUITestHandler::RunJavaScriptTestWithResult(

test_succeeded_ = false;

run_test_succeeded_ = false;

content::RenderFrameHost* frame = web_ui()->GetWebContents()->GetMainFrame();

- frame->ExecuteJavaScript(js_text,

- base::Bind(&WebUITestHandler::JavaScriptComplete,

- base::Unretained(this)));

+ frame->ExecuteJavaScriptForTests(

+ js_text, base::Bind(&WebUITestHandler::JavaScriptComplete,

+ base::Unretained(this)));

return WaitForResult();

}