content/browser/renderer_host/resource_dispatcher_host_browsertest.cc - Issue 10795090: Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused…

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

Index: content/browser/renderer_host/resource_dispatcher_host_browsertest.cc

===================================================================

--- content/browser/renderer_host/resource_dispatcher_host_browsertest.cc (revision 148111)

+++ content/browser/renderer_host/resource_dispatcher_host_browsertest.cc (working copy)

@@ -124,8 +124,7 @@

content::NotificationService::AllSources());

// Create dynamic popup.

- if (!ui_test_utils::ExecuteJavaScript(

- render_view_host(), L"", L"OpenPopup();"))

+ if (!content::ExecuteJavaScript(render_view_host(), L"", L"OpenPopup();"))

return false;

observer.Wait();

@@ -216,7 +215,7 @@

// Let's check the XMLHttpRequest ran successfully.

bool success = false;

- EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

+ EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(

chrome::GetActiveWebContents(browser())->GetRenderViewHost(),

L"",

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

@@ -234,7 +233,7 @@

// Let's check the XMLHttpRequest ran successfully.

bool success = false;

- EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

+ EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(

chrome::GetActiveWebContents(browser())->GetRenderViewHost(),

L"",

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

@@ -409,7 +408,7 @@

std::string redirect_script = "window.location='" +

test_url.possibly_invalid_spec() + "';" +

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

- EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(

+ EXPECT_TRUE(content::ExecuteJavaScriptAndExtractBool(

chrome::GetActiveWebContents(browser())->GetRenderViewHost(),

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

EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());