| Index: content/browser/session_history_browsertest.cc
|
| ===================================================================
|
| --- content/browser/session_history_browsertest.cc (revision 148111)
|
| +++ content/browser/session_history_browsertest.cc (working copy)
|
| @@ -434,14 +434,14 @@
|
| // http://code.google.com/p/chromium/issues/detail?id=56267
|
| IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
|
| int length;
|
| - ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
|
| + ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| L"", L"domAutomationController.send(history.length)", &length));
|
| EXPECT_EQ(1, length);
|
|
|
| ui_test_utils::NavigateToURL(browser(), GetURL("title1.html"));
|
|
|
| - ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
|
| + ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| L"", L"domAutomationController.send(history.length)", &length));
|
| EXPECT_EQ(2, length);
|
| @@ -449,7 +449,7 @@
|
| // Now test that history.length is updated when the navigation is committed.
|
| ui_test_utils::NavigateToURL(browser(), GetURL("record_length.html"));
|
|
|
| - ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
|
| + ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| L"", L"domAutomationController.send(history.length)", &length));
|
| EXPECT_EQ(3, length);
|
| @@ -460,7 +460,7 @@
|
| // Ensure history.length is properly truncated.
|
| ui_test_utils::NavigateToURL(browser(), GetURL("title2.html"));
|
|
|
| - ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
|
| + ASSERT_TRUE(content::ExecuteJavaScriptAndExtractInt(
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| L"", L"domAutomationController.send(history.length)", &length));
|
| EXPECT_EQ(2, length);
|
|
|