chrome/browser/extensions/extension_startup_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: chrome/browser/extensions/extension_startup_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 | « chrome/browser/extensions/extension_resource_request_policy_apitest.cc ('k') | chrome/browser/extensions/isolated_app_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_startup_browsertest.cc

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

index 52b468018bd2ba555c5c701e386d3c3e19fccd1e..ce09e05883aba45fc991ddad3457c710335b6db3 100644

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

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

@@ -127,17 +127,19 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {

bool result = false;

ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

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

- L"window.domAutomationController.send("

- L"document.defaultView.getComputedStyle(document.body, null)."

- L"getPropertyValue('background-color') == 'rgb(245, 245, 220)')",

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

+ "",

+ "window.domAutomationController.send("

+ "document.defaultView.getComputedStyle(document.body, null)."

+ "getPropertyValue('background-color') == 'rgb(245, 245, 220)')",

&result));

EXPECT_EQ(expect_css, result);

result = false;

ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(

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

- L"window.domAutomationController.send(document.title == 'Modified')",

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

+ "",

+ "window.domAutomationController.send(document.title == 'Modified')",

&result));

EXPECT_EQ(expect_script, result);

}