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

Unified Diff: chrome/browser/dom_ui/bookmarks_ui_uitest.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/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);
}
};

Powered by Google App Engine
This is Rietveld 408576698