| Index: chrome/browser/extensions/extension_startup_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_startup_browsertest.cc (revision 174946)
|
| +++ chrome/browser/extensions/extension_startup_browsertest.cc (working copy)
|
| @@ -127,19 +127,17 @@
|
|
|
| bool result = false;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
|
| - chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| - "",
|
| - "window.domAutomationController.send("
|
| - "document.defaultView.getComputedStyle(document.body, null)."
|
| - "getPropertyValue('background-color') == 'rgb(245, 245, 220)')",
|
| + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
|
| + L"window.domAutomationController.send("
|
| + L"document.defaultView.getComputedStyle(document.body, null)."
|
| + L"getPropertyValue('background-color') == 'rgb(245, 245, 220)')",
|
| &result));
|
| EXPECT_EQ(expect_css, result);
|
|
|
| result = false;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
|
| - chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| - "",
|
| - "window.domAutomationController.send(document.title == 'Modified')",
|
| + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
|
| + L"window.domAutomationController.send(document.title == 'Modified')",
|
| &result));
|
| EXPECT_EQ(expect_script, result);
|
| }
|
|
|
| Property changes on: chrome/browser/extensions/extension_startup_browsertest.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|