content/renderer/render_view_browsertest_mac.mm - Issue 1257603003: Revert of 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: content/renderer/render_view_browsertest_mac.mm

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

Patch Set: 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 | « content/renderer/render_view_browsertest.cc ('k') | extensions/browser/api/system_storage/system_storage_eject_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_view_browsertest_mac.mm

diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm

index a973c313c4ecdc2b9096de0f0fc395bb222e96d2..6730da746aacfa6c84aade51397e0e32dfb65add 100644

--- a/content/renderer/render_view_browsertest_mac.mm

+++ b/content/renderer/render_view_browsertest_mac.mm

@@ -103,7 +103,7 @@

EditCommands(1, EditCommand("moveToEndOfDocument", "")));

SendNativeKeyEvent(NativeWebKeyboardEvent(arrowDownKeyDown));

ProcessPendingMessages();

- ExecuteJavaScriptForTests("scroll.textContent = window.pageYOffset");

+ ExecuteJavaScript("scroll.textContent = window.pageYOffset");

output = GetMainFrame()->contentAsText(kMaxOutputCharacters);

EXPECT_EQ(kArrowDownScrollDown, base::UTF16ToASCII(output));

@@ -112,21 +112,21 @@

EditCommands(1, EditCommand("moveToBeginningOfDocument", "")));

SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown));

ProcessPendingMessages();

- ExecuteJavaScriptForTests("scroll.textContent = window.pageYOffset");

+ ExecuteJavaScript("scroll.textContent = window.pageYOffset");

output = GetMainFrame()->contentAsText(kMaxOutputCharacters);

EXPECT_EQ(kArrowUpScrollUp, base::UTF16ToASCII(output));

// Now let javascript eat the key events -- no scrolling should happen.

// Set a scroll position slightly down the page to ensure that it does not

// move.

- ExecuteJavaScriptForTests("allowKeyEvents = false; window.scrollTo(0, 100)");

+ ExecuteJavaScript("allowKeyEvents = false; window.scrollTo(0, 100)");

const char* kArrowDownNoScroll = "40,false,false,true,false\n100\np1";

view->OnSetEditCommandsForNextKeyEvent(

EditCommands(1, EditCommand("moveToEndOfDocument", "")));

SendNativeKeyEvent(NativeWebKeyboardEvent(arrowDownKeyDown));

ProcessPendingMessages();

- ExecuteJavaScriptForTests("scroll.textContent = window.pageYOffset");

+ ExecuteJavaScript("scroll.textContent = window.pageYOffset");

output = GetMainFrame()->contentAsText(kMaxOutputCharacters);

EXPECT_EQ(kArrowDownNoScroll, base::UTF16ToASCII(output));

@@ -135,7 +135,7 @@

EditCommands(1, EditCommand("moveToBeginningOfDocument", "")));

SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown));

ProcessPendingMessages();

- ExecuteJavaScriptForTests("scroll.textContent = window.pageYOffset");

+ ExecuteJavaScript("scroll.textContent = window.pageYOffset");

output = GetMainFrame()->contentAsText(kMaxOutputCharacters);

EXPECT_EQ(kArrowUpNoScroll, base::UTF16ToASCII(output));

}