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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_view_host_manager_browsertest.cc

Issue 11728003: Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding files for gpu_tests and NaCl browser tests. 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/loader/resource_dispatcher_host_browsertest.cc ('k') | content/browser/renderer_host/render_widget_host_view_win_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_view_host_manager_browsertest.cc
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index 015cf1e959671474e0de58d24247920b23dfdea2..60c607b11be390cf0fb0a157fb2dd84e6abbfa3a 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -131,8 +131,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetedLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetedLink());",
&success));
EXPECT_TRUE(success);
Shell* new_shell = new_shell_observer.GetShell();
@@ -150,8 +151,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
// We should have access to the opened window's location.
success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(testScriptAccessToWindow());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(testScriptAccessToWindow());",
&success));
EXPECT_TRUE(success);
@@ -164,8 +166,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) {
// We should no longer have script access to the opened window's location.
success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(testScriptAccessToWindow());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(testScriptAccessToWindow());",
&success));
EXPECT_FALSE(success);
}
@@ -199,8 +202,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickNoRefTargetBlankLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickNoRefTargetBlankLink());",
&success));
EXPECT_TRUE(success);
@@ -252,8 +256,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteNoRefTargetedLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteNoRefTargetedLink());",
&success));
EXPECT_TRUE(success);
@@ -305,8 +310,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickTargetBlankLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickTargetBlankLink());",
&success));
EXPECT_TRUE(success);
@@ -352,8 +358,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
// Test clicking a rel=noreferrer link.
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickNoRefLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickNoRefLink());",
&success));
EXPECT_TRUE(success);
@@ -399,8 +406,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetedLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetedLink());",
&success));
EXPECT_TRUE(success);
Shell* new_shell = new_shell_observer.GetShell();
@@ -427,8 +435,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
Source<NavigationController>(
&new_shell->web_contents()->GetController()));
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetedLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetedLink());",
&success));
EXPECT_TRUE(success);
navigation_observer.Wait();
@@ -447,8 +456,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
NOTIFICATION_WEB_CONTENTS_DESTROYED,
Source<WebContents>(new_shell->web_contents()));
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(testCloseWindow());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(testCloseWindow());",
&success));
EXPECT_TRUE(success);
close_observer.Wait();
@@ -482,8 +492,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetBlankLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetBlankLink());",
&success));
EXPECT_TRUE(success);
Shell* new_shell = new_shell_observer.GetShell();
@@ -506,8 +517,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
// Now disown the opener.
EXPECT_TRUE(ExecuteJavaScript(
- new_shell->web_contents()->GetRenderViewHost(), L"",
- L"window.opener = null;"));
+ new_shell->web_contents()->GetRenderViewHost(),
+ "",
+ "window.opener = null;"));
// Go back and ensure the opener is still null.
{
@@ -520,8 +532,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
}
success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- new_shell->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(window.opener == null);",
+ new_shell->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(window.opener == null);",
&success));
EXPECT_TRUE(success);
@@ -529,8 +542,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownOpener) {
NavigateToURL(new_shell, https_server.GetURL("files/title1.html"));
success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- new_shell->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(window.opener == null);",
+ new_shell->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(window.opener == null);",
&success));
EXPECT_TRUE(success);
}
@@ -578,8 +592,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- opener_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetedLink());",
+ opener_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetedLink());",
&success));
EXPECT_TRUE(success);
Shell* new_shell = new_shell_observer.GetShell();
@@ -597,8 +612,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
// Second, a target=_blank window.
ShellAddedObserver new_shell_observer2;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetBlankLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetBlankLink());",
&success));
EXPECT_TRUE(success);
@@ -623,9 +639,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
// origin is wrong. We won't see an error, but we can check for the right
// number of received messages below.
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- foo_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(postToOpener('msg',"
- L"'http://google.com'));",
+ foo_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(postToOpener('msg',"
+ "'http://google.com'));",
&success));
EXPECT_TRUE(success);
ASSERT_FALSE(opener_manager->GetSwappedOutRenderViewHost(orig_site_instance));
@@ -636,8 +653,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
Source<WebContents>(foo_contents));
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- foo_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(postToOpener('msg','*'));",
+ foo_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(postToOpener('msg','*'));",
&success));
EXPECT_TRUE(success);
ASSERT_FALSE(opener_manager->GetSwappedOutRenderViewHost(orig_site_instance));
@@ -647,13 +665,15 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
// and updated the title.
int opener_received_messages = 0;
EXPECT_TRUE(ExecuteJavaScriptAndExtractInt(
- opener_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(window.receivedMessages);",
+ opener_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(window.receivedMessages);",
&opener_received_messages));
int foo_received_messages = 0;
EXPECT_TRUE(ExecuteJavaScriptAndExtractInt(
- foo_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(window.receivedMessages);",
+ foo_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(window.receivedMessages);",
&foo_received_messages));
EXPECT_EQ(1, foo_received_messages);
EXPECT_EQ(1, opener_received_messages);
@@ -665,8 +685,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED,
Source<WebContents>(foo_contents));
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- new_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(postToFoo('msg2'));",
+ new_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(postToFoo('msg2'));",
&success));
EXPECT_TRUE(success);
title_observer2.Wait();
@@ -710,8 +731,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- orig_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetedLink());",
+ orig_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetedLink());",
&success));
EXPECT_TRUE(success);
Shell* new_shell = new_shell_observer.GetShell();
@@ -738,8 +760,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
Source<NavigationController>(
&orig_contents->GetController()));
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- new_shell->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(navigateOpener());",
+ new_shell->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(navigateOpener());",
&success));
EXPECT_TRUE(success);
navigation_observer.Wait();
@@ -780,8 +803,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetedLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetedLink());",
&success));
EXPECT_TRUE(success);
Shell* new_shell = new_shell_observer.GetShell();
@@ -861,8 +885,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
// Renderer-initiated navigations should work.
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickNoRefLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickNoRefLink());",
&success));
EXPECT_TRUE(success);
@@ -1020,8 +1045,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(clickSameSiteTargetedLink());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(clickSameSiteTargetedLink());",
&success));
EXPECT_TRUE(success);
Shell* new_shell = new_shell_observer.GetShell();
@@ -1033,9 +1059,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
RenderViewHost* rvh = new_shell->web_contents()->GetRenderViewHost();
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- rvh, L"",
- L"window.domAutomationController.send("
- L"document.webkitVisibilityState == 'visible');",
+ rvh,
+ "",
+ "window.domAutomationController.send("
+ "document.webkitVisibilityState == 'visible');",
&success));
EXPECT_TRUE(success);
@@ -1044,9 +1071,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
NavigateToURL(new_shell, https_server.GetURL("files/title1.html"));
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- rvh, L"",
- L"window.domAutomationController.send("
- L"document.webkitVisibilityState == 'hidden');",
+ rvh,
+ "",
+ "window.domAutomationController.send("
+ "document.webkitVisibilityState == 'hidden');",
&success));
EXPECT_TRUE(success);
@@ -1068,9 +1096,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
EXPECT_EQ(rvh, new_shell->web_contents()->GetRenderViewHost());
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- rvh, L"",
- L"window.domAutomationController.send("
- L"document.webkitVisibilityState == 'visible');",
+ rvh,
+ "",
+ "window.domAutomationController.send("
+ "document.webkitVisibilityState == 'visible');",
&success));
EXPECT_TRUE(success);
}
@@ -1239,8 +1268,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
ShellAddedObserver shell_observer1;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- opener_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(openWindow('1-3.html'));",
+ opener_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(openWindow('1-3.html'));",
&success));
EXPECT_TRUE(success);
@@ -1260,8 +1290,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
ShellAddedObserver shell_observer2;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- opener_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(openWindow('../title2.html'));",
+ opener_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(openWindow('../title2.html'));",
&success));
EXPECT_TRUE(success);
@@ -1320,8 +1351,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
// Now let's ensure that using JS to add/remove frames results in proper
// updates.
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- opener_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(removeFrame());",
+ opener_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(removeFrame());",
&success));
EXPECT_TRUE(success);
frames = GetTree(opener_rvhm->current_host());
@@ -1335,8 +1367,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DISABLED_FrameTreeUpdates) {
Source<NavigationController>(
&opener_contents->GetController()));
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- opener_contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(addFrame());",
+ opener_contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(addFrame());",
&success));
EXPECT_TRUE(success);
load_observer.Wait();
@@ -1386,8 +1419,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
ShellAddedObserver new_shell_observer;
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
- shell()->web_contents()->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(openWindow());",
+ shell()->web_contents()->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(openWindow());",
&success));
EXPECT_TRUE(success);
Shell* new_shell = new_shell_observer.GetShell();
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_browsertest.cc ('k') | content/browser/renderer_host/render_widget_host_view_win_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698