Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2951)

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 10795090: Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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/notifications/notification_browsertest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
===================================================================
--- chrome/browser/prerender/prerender_browsertest.cc (revision 148111)
+++ chrome/browser/prerender/prerender_browsertest.cc (working copy)
@@ -706,7 +706,7 @@
chrome::GoBack(current_browser(), CURRENT_TAB);
back_nav_observer.Wait();
bool original_prerender_page = false;
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
L"", L"window.domAutomationController.send(IsOriginalPrerenderPage())",
&original_prerender_page));
@@ -726,7 +726,7 @@
chrome::GoBack(current_browser(), CURRENT_TAB);
back_nav_observer.Wait();
bool js_result;
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
tab->GetRenderViewHost(), L"",
L"window.domAutomationController.send(DidBackToOriginalPagePass())",
&js_result));
@@ -928,7 +928,7 @@
// Check if page behaves as expected while in prerendered state.
bool prerender_test_result = false;
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
prerender_contents->GetRenderViewHostMutable(), L"",
L"window.domAutomationController.send(DidPrerenderPass())",
&prerender_test_result));
@@ -987,7 +987,7 @@
page_load_observer->Wait();
bool display_test_result = false;
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
web_contents->GetRenderViewHost(), L"",
L"window.domAutomationController.send(DidDisplayPass())",
&display_test_result));
@@ -1182,7 +1182,7 @@
// loading. It would be great if we could avoid that.
WebContents* web_contents = chrome::GetActiveWebContents(browser());
bool display_test_result = false;
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
web_contents->GetRenderViewHost(), L"",
L"window.domAutomationController.send(DidDisplayPass())",
&display_test_result));
@@ -2313,7 +2313,7 @@
// asynchronously.
WebContents* web_contents = chrome::GetActiveWebContents(browser());
bool display_test_result = false;
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
web_contents->GetRenderViewHost(), L"",
L"DidDisplayReallyPass()",
&display_test_result));
« no previous file with comments | « chrome/browser/notifications/notification_browsertest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698