chrome/browser/extensions/extension_keybinding_apitest.cc - Issue 11753009: Simplify ExecuteJavaScript* functions.

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: chrome/browser/extensions/extension_keybinding_apitest.cc

Issue 11753009: Simplify ExecuteJavaScript* functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update prerender_browsertest.cc. 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 | « chrome/browser/extensions/extension_incognito_apitest.cc ('k') | chrome/browser/extensions/extension_nacl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_keybinding_apitest.cc

diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc

index 32ed8a00ffd2c00336f7d4552e2743e7ac8a0180..fa72cb4d8b2f0ab4097a59e9e5bc54a36ed83ba4 100644

--- a/chrome/browser/extensions/extension_keybinding_apitest.cc

+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc

@@ -89,9 +89,8 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) {

// Verify the command worked.

bool result = false;

- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

- tab->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(content::ExecuteScriptAndExtractBool(

+ tab,

"setInterval(function(){"

" if(document.body.bgColor == 'red'){"

" window.domAutomationController.send(true)}}, 100)",

@@ -103,9 +102,8 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, Basic) {

browser(), ui::VKEY_Y, true, true, false, false));

result = false;

- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

- tab->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(content::ExecuteScriptAndExtractBool(

+ tab,

"setInterval(function(){"

" if(document.body.bgColor == 'blue'){"

" window.domAutomationController.send(true)}}, 100)",

@@ -151,9 +149,8 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_PageAction) {

// Verify the command worked (the page action turns the page red).

WebContents* tab = chrome::GetActiveWebContents(browser());

bool result = false;

- ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

- tab->GetRenderViewHost(),

- "",

+ ASSERT_TRUE(content::ExecuteScriptAndExtractBool(

+ tab,

"setInterval(function(){"

" if(document.body.bgColor == 'red'){"

" window.domAutomationController.send(true)}}, 100)",