Index: chrome/browser/dom_ui/bookmarks_ui_uitest.cc |
=================================================================== |
--- chrome/browser/dom_ui/bookmarks_ui_uitest.cc (revision 73855) |
+++ chrome/browser/dom_ui/bookmarks_ui_uitest.cc (working copy) |
@@ -5,6 +5,7 @@ |
#include "chrome/test/ui/ui_test.h" |
#include "base/test/test_timeouts.h" |
+#include "base/utf_string_conversions.h" |
#include "chrome/app/chrome_command_ids.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/test/automation/browser_proxy.h" |
@@ -48,13 +49,13 @@ |
void AssertIsBookmarksPage(TabProxy* tab) { |
// tab->GetCurrentURL is not up to date. |
GURL url; |
- std::wstring out; |
- ASSERT_TRUE(tab->ExecuteAndExtractString(L"", |
- L"domAutomationController.send(location.protocol)", &out)); |
- ASSERT_EQ(L"chrome-extension:", out); |
- ASSERT_TRUE(tab->ExecuteAndExtractString(L"", |
- L"domAutomationController.send(location.pathname)", &out)); |
- ASSERT_EQ(L"/main.html", out); |
+ string16 out; |
+ ASSERT_TRUE(tab->ExecuteAndExtractString(string16(), |
+ ASCIIToUTF16("domAutomationController.send(location.protocol)"), &out)); |
+ ASSERT_EQ(ASCIIToUTF16("chrome-extension:"), out); |
+ ASSERT_TRUE(tab->ExecuteAndExtractString(string16(), |
+ ASCIIToUTF16("domAutomationController.send(location.pathname)"), &out)); |
+ ASSERT_EQ(ASCIIToUTF16("/main.html"), out); |
} |
}; |