chrome/browser/geolocation/geolocation_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: chrome/browser/geolocation/geolocation_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/browser/extensions/api/web_navigation/web_navigation_apitest.cc ('k') | chrome/browser/mouseleave_browsertest.cc » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_browsertest.cc

diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc

index 4d7812ed93a653deea051a0ba45ca49a855c4606..28f5e7d8f9c8f71a25157227515ef462cc79eed4 100644

--- a/chrome/browser/geolocation/geolocation_browsertest.cc

+++ b/chrome/browser/geolocation/geolocation_browsertest.cc

@@ -90,7 +90,8 @@ IFrameLoader::IFrameLoader(Browser* browser, int iframe_id, const GURL& url)

"window.domAutomationController.setAutomationId(0);"

"window.domAutomationController.send(addIFrame(%d, \"%s\"));",

iframe_id, url.spec().c_str()));

- web_contents->GetMainFrame()->ExecuteJavaScript(base::UTF8ToUTF16(script));

+ web_contents->GetMainFrame()->ExecuteJavaScriptForTests(

+ base::UTF8ToUTF16(script));

content::RunMessageLoop();

EXPECT_EQ(base::StringPrintf("\"%d\"", iframe_id), javascript_response_);