content/browser/session_history_browsertest.cc - Issue 11753009: Simplify ExecuteJavaScript* functions.

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/browser/session_history_browsertest.cc

Issue 11753009: Simplify ExecuteJavaScript* functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update prerender_browsertest.cc. Created 7 years, 12 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/browser/renderer_host/render_widget_host_view_win_browsertest.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/session_history_browsertest.cc

diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc

index c81f89c0830b936b24722cda3b2f348a5dd52589..c57f1a69ca75de7da1a5d71100c059e75508310f 100644

--- a/content/browser/session_history_browsertest.cc

+++ b/content/browser/session_history_browsertest.cc

@@ -429,18 +429,16 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, LocationChangeInSubframe) {

// http://code.google.com/p/chromium/issues/detail?id=56267

IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {

int length;

- ASSERT_TRUE(ExecuteJavaScriptAndExtractInt(

- shell()->web_contents()->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(ExecuteScriptAndExtractInt(

+ shell()->web_contents(),

"domAutomationController.send(history.length)",

&length));

EXPECT_EQ(1, length);

NavigateToURL(shell(), GetURL("title1.html"));

- ASSERT_TRUE(ExecuteJavaScriptAndExtractInt(

- shell()->web_contents()->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(ExecuteScriptAndExtractInt(

+ shell()->web_contents(),

"domAutomationController.send(history.length)",

&length));

EXPECT_EQ(2, length);

@@ -448,9 +446,8 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {

// Now test that history.length is updated when the navigation is committed.

NavigateToURL(shell(), GetURL("record_length.html"));

- ASSERT_TRUE(ExecuteJavaScriptAndExtractInt(

- shell()->web_contents()->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(ExecuteScriptAndExtractInt(

+ shell()->web_contents(),

"domAutomationController.send(history.length)",

&length));

EXPECT_EQ(3, length);

@@ -461,9 +458,8 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {

// Ensure history.length is properly truncated.

NavigateToURL(shell(), GetURL("title2.html"));

- ASSERT_TRUE(ExecuteJavaScriptAndExtractInt(

- shell()->web_contents()->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(ExecuteScriptAndExtractInt(

+ shell()->web_contents(),

"domAutomationController.send(history.length)",

&length));

EXPECT_EQ(2, length);