Index: chrome/browser/ui/webui/bookmarks_ui_browsertest.cc |
=================================================================== |
--- chrome/browser/ui/webui/bookmarks_ui_browsertest.cc (revision 174946) |
+++ chrome/browser/ui/webui/bookmarks_ui_browsertest.cc (working copy) |
@@ -33,16 +33,12 @@ |
GURL url; |
std::string out; |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( |
- tab->GetRenderViewHost(), |
- "", |
- "domAutomationController.send(location.protocol)", |
- &out)); |
+ tab->GetRenderViewHost(), L"", |
+ L"domAutomationController.send(location.protocol)", &out)); |
ASSERT_EQ("chrome-extension:", out); |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( |
- tab->GetRenderViewHost(), |
- "", |
- "domAutomationController.send(location.pathname)", |
- &out)); |
+ tab->GetRenderViewHost(), L"", |
+ L"domAutomationController.send(location.pathname)", &out)); |
ASSERT_EQ("/main.html", out); |
} |
}; |
Property changes on: chrome/browser/ui/webui/bookmarks_ui_browsertest.cc |
___________________________________________________________________ |
Deleted: svn:mergeinfo |