| Index: chrome/browser/prerender/prerender_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/prerender/prerender_browsertest.cc (revision 174946)
|
| +++ chrome/browser/prerender/prerender_browsertest.cc (working copy)
|
| @@ -784,8 +784,7 @@
|
| bool original_prerender_page = false;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
|
| chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
|
| - "",
|
| - "window.domAutomationController.send(IsOriginalPrerenderPage())",
|
| + L"", L"window.domAutomationController.send(IsOriginalPrerenderPage())",
|
| &original_prerender_page));
|
| EXPECT_TRUE(original_prerender_page);
|
| }
|
| @@ -804,9 +803,8 @@
|
| back_nav_observer.Wait();
|
| bool js_result;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
|
| - tab->GetRenderViewHost(),
|
| - "",
|
| - "window.domAutomationController.send(DidBackToOriginalPagePass())",
|
| + tab->GetRenderViewHost(), L"",
|
| + L"window.domAutomationController.send(DidBackToOriginalPagePass())",
|
| &js_result));
|
| EXPECT_TRUE(js_result);
|
| }
|
| @@ -852,28 +850,26 @@
|
|
|
| bool DidReceivePrerenderStartEventForLinkNumber(int index) const {
|
| bool received_prerender_started;
|
| - std::string expression = base::StringPrintf(
|
| - "window.domAutomationController.send(Boolean("
|
| - "receivedPrerenderStartEvents[%d]))", index);
|
| + std::wstring expression = base::StringPrintf(
|
| + L"window.domAutomationController.send(Boolean("
|
| + L"receivedPrerenderStartEvents[%d]))", index);
|
|
|
| CHECK(content::ExecuteJavaScriptAndExtractBool(
|
| chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
|
| - "",
|
| - expression,
|
| + L"", expression,
|
| &received_prerender_started));
|
| return received_prerender_started;
|
| }
|
|
|
| bool DidReceivePrerenderStopEventForLinkNumber(int index) const {
|
| bool received_prerender_stopped;
|
| - std::string expression = base::StringPrintf(
|
| - "window.domAutomationController.send(Boolean("
|
| - "receivedPrerenderStopEvents[%d]))", index);
|
| + std::wstring expression = base::StringPrintf(
|
| + L"window.domAutomationController.send(Boolean("
|
| + L"receivedPrerenderStopEvents[%d]))", index);
|
|
|
| CHECK(content::ExecuteJavaScriptAndExtractBool(
|
| chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(),
|
| - "",
|
| - expression,
|
| + L"", expression,
|
| &received_prerender_stopped));
|
| return received_prerender_stopped;
|
| }
|
| @@ -1038,9 +1034,8 @@
|
| // Check if page behaves as expected while in prerendered state.
|
| bool prerender_test_result = false;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
|
| - prerender_contents->GetRenderViewHostMutable(),
|
| - "",
|
| - "window.domAutomationController.send(DidPrerenderPass())",
|
| + prerender_contents->GetRenderViewHostMutable(), L"",
|
| + L"window.domAutomationController.send(DidPrerenderPass())",
|
| &prerender_test_result));
|
| EXPECT_TRUE(prerender_test_result);
|
| }
|
| @@ -1097,9 +1092,8 @@
|
|
|
| bool display_test_result = false;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
|
| - web_contents->GetRenderViewHost(),
|
| - "",
|
| - "window.domAutomationController.send(DidDisplayPass())",
|
| + web_contents->GetRenderViewHost(), L"",
|
| + L"window.domAutomationController.send(DidDisplayPass())",
|
| &display_test_result));
|
| EXPECT_TRUE(display_test_result);
|
| }
|
| @@ -1406,9 +1400,8 @@
|
| WebContents* web_contents = chrome::GetActiveWebContents(browser());
|
| bool display_test_result = false;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
|
| - web_contents->GetRenderViewHost(),
|
| - "",
|
| - "window.domAutomationController.send(DidDisplayPass())",
|
| + web_contents->GetRenderViewHost(), L"",
|
| + L"window.domAutomationController.send(DidDisplayPass())",
|
| &display_test_result));
|
| EXPECT_TRUE(display_test_result);
|
| }
|
| @@ -2574,9 +2567,8 @@
|
| WebContents* web_contents = chrome::GetActiveWebContents(browser());
|
| bool display_test_result = false;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
|
| - web_contents->GetRenderViewHost(),
|
| - "",
|
| - "DidDisplayReallyPass()",
|
| + web_contents->GetRenderViewHost(), L"",
|
| + L"DidDisplayReallyPass()",
|
| &display_test_result));
|
| ASSERT_TRUE(display_test_result);
|
| }
|
|
|