chrome/browser/extensions/api/web_navigation/web_navigation_apitest.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/extensions/api/web_navigation/web_navigation_apitest.cc

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

Patch Set: android 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/media_galleries/media_galleries_watch_apitest.cc ('k') | chrome/browser/geolocation/geolocation_browsertest.cc » ('j') | content/public/browser/render_frame_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

index 169f8da2b04d6e32a15ab6fd9a6c1b20467985a8..8b6c1156be08f3f7e188bf017266d063be298d1f 100644

--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

@@ -213,7 +213,8 @@ class DelayLoadStartAndExecuteJavascript

rvh_->GetMainFrame()->ExecuteJavaScriptWithUserGestureForTests(

base::UTF8ToUTF16(script_));

} else {

- rvh_->GetMainFrame()->ExecuteJavaScript(base::UTF8ToUTF16(script_));

+ rvh_->GetMainFrame()->ExecuteJavaScriptForTests(

+ base::UTF8ToUTF16(script_));

}

script_was_executed_ = true;

}

@@ -673,7 +674,8 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessAbort) {

// Ensure the cross-site navigation has started, then execute JavaScript

// to cause the renderer-initiated, non-user navigation.

cross_site_load.Wait();

- tab->GetMainFrame()->ExecuteJavaScript(base::UTF8ToUTF16("navigate2()"));

+ tab->GetMainFrame()->ExecuteJavaScriptForTests(

+ base::UTF8ToUTF16("navigate2()"));

// Wait for the same-site navigation to start and resume the cross-site

// one, allowing it to commit.