chrome/browser/extensions/extension_keybinding_apitest.cc - Issue 11734018: Revert 174880 due to compilation error in pdf_browsertest.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: chrome/browser/extensions/extension_keybinding_apitest.cc

Issue 11734018: Revert 174880 due to compilation error in pdf_browsertest.cc (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1374/src/

Patch Set: 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

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

--- chrome/browser/extensions/extension_keybinding_apitest.cc (revision 174946)

+++ chrome/browser/extensions/extension_keybinding_apitest.cc (working copy)

@@ -90,11 +90,10 @@

// Verify the command worked.

bool result = false;

ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

- tab->GetRenderViewHost(),

- "",

- "setInterval(function(){"

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

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

+ tab->GetRenderViewHost(), L"",

+ L"setInterval(function(){"

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

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

&result));

ASSERT_TRUE(result);

@@ -104,11 +103,10 @@

result = false;

ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

- tab->GetRenderViewHost(),

- "",

- "setInterval(function(){"

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

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

+ tab->GetRenderViewHost(), L"",

+ L"setInterval(function(){"

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

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

&result));

ASSERT_TRUE(result);

}

@@ -152,11 +150,10 @@

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

bool result = false;

ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

- tab->GetRenderViewHost(),

- "",

- "setInterval(function(){"

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

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

+ tab->GetRenderViewHost(), L"",

+ L"setInterval(function(){"

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

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

&result));

ASSERT_TRUE(result);

}