components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc - 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: components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc

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 | « chrome/renderer/autofill/password_generation_agent_browsertest.cc ('k') | components/dom_distiller/content/browser/test/dom_distiller_js_browsertest.cc » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc

diff --git a/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc b/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc

index 99f40f0b9d8e2fdff67594f2beafd62a88ba25f4..ac503d9859ee365381ddfc71d0c4ec8f1342d156 100644

--- a/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc

+++ b/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc

@@ -504,7 +504,7 @@ IN_PROC_BROWSER_TEST_F(DistillerPageWebContentsTest,

// Execute the JS to run the tests, and wait until it has finished.

base::RunLoop run_loop;

- web_contents->GetMainFrame()->ExecuteJavaScript(

+ web_contents->GetMainFrame()->ExecuteJavaScriptForTests(

base::UTF8ToUTF16("(function() {return pinchtest.run();})();"),

base::Bind(&DistillerPageWebContentsTest::OnJsExecutionDone,

base::Unretained(this), run_loop.QuitClosure()));