content/browser/loader/resource_dispatcher_host_browsertest.cc - Issue 11728003: Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc}

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/loader/resource_dispatcher_host_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/in_process_webkit/indexed_db_browsertest.cc ('k') | content/browser/renderer_host/render_view_host_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/loader/resource_dispatcher_host_browsertest.cc

diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc

index eee7c393570e3dbb5c267a08bbdf468dc5c117d9..a9457ea661939e96a2162c82e5520881b77a9328 100644

--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc

+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc

@@ -69,7 +69,7 @@ class ResourceDispatcherHostBrowserTest : public ContentBrowserTest,

ShellAddedObserver new_shell_observer;

// Create dynamic popup.

- if (!ExecuteJavaScript(render_view_host(), L"", L"OpenPopup();"))

+ if (!ExecuteJavaScript(render_view_host(), "", "OpenPopup();"))

return false;

Shell* new_shell = new_shell_observer.GetShell();

@@ -167,8 +167,8 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, SyncXMLHttpRequest) {

bool success = false;

EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(

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

- L"",

- L"window.domAutomationController.send(DidSyncRequestSucceed());",

+ "",

+ "window.domAutomationController.send(DidSyncRequestSucceed());",

&success));

EXPECT_TRUE(success);

}

@@ -185,8 +185,8 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,

bool success = false;

EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(

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

- L"",

- L"window.domAutomationController.send(DidSucceed());",

+ "",

+ "window.domAutomationController.send(DidSucceed());",

&success));

EXPECT_TRUE(success);

}

@@ -348,7 +348,9 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,

"window.domAutomationController.send(true);";

EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(

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

- L"", ASCIIToWide(redirect_script), &success));

+ "",

+ redirect_script,

+ &success));

EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());

}