Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5882)

Unified Diff: chrome/browser/extensions/extension_startup_browsertest.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
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

Powered by Google App Engine
This is Rietveld 408576698