chrome/browser/mouseleave_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/mouseleave_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/geolocation/geolocation_browsertest.cc ('k') | chrome/browser/prerender/prerender_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/mouseleave_browsertest.cc

diff --git a/chrome/browser/mouseleave_browsertest.cc b/chrome/browser/mouseleave_browsertest.cc

index c4bcbcf450b7adfa431e017cdcb9f1256c18e822..6719b9394d356debca9bf729e14055af6450ef6d 100644

--- a/chrome/browser/mouseleave_browsertest.cc

+++ b/chrome/browser/mouseleave_browsertest.cc

@@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(MouseLeaveTest, MAYBE_ContextMenu) {

// Wait until the context menu is opened and closed.

menu_observer.WaitForMenuOpenAndClose();

- tab->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16("done()"));

+ tab->GetMainFrame()->ExecuteJavaScriptForTests(base::ASCIIToUTF16("done()"));

const base::string16 success_title = base::ASCIIToUTF16("without mouseleave");

const base::string16 failure_title = base::ASCIIToUTF16("with mouseleave");

content::TitleWatcher done_title_watcher(tab, success_title);

@@ -156,12 +156,12 @@ IN_PROC_BROWSER_TEST_F(MouseLeaveTest, MAYBE_ModalDialog) {

EXPECT_NO_FATAL_FAILURE(LoadTestPageAndWaitForMouseOver(tab));

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

+ tab->GetMainFrame()->ExecuteJavaScriptForTests(base::UTF8ToUTF16("alert()"));

app_modal::AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();

// Cancel the dialog.

alert->CloseModalDialog();

- tab->GetMainFrame()->ExecuteJavaScript(base::ASCIIToUTF16("done()"));

+ tab->GetMainFrame()->ExecuteJavaScriptForTests(base::ASCIIToUTF16("done()"));

const base::string16 success_title = base::ASCIIToUTF16("without mouseleave");

const base::string16 failure_title = base::ASCIIToUTF16("with mouseleave");

content::TitleWatcher done_title_watcher(tab, success_title);