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

Unified Diff: chrome/browser/encoding_menu_controller_unittest.cc

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)
Patch Set: mac and linux fixes Created 11 years, 3 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
« no previous file with comments | « chrome/browser/encoding_menu_controller.cc ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/encoding_menu_controller_unittest.cc
diff --git a/chrome/browser/encoding_menu_controller_unittest.cc b/chrome/browser/encoding_menu_controller_unittest.cc
index a8258bd6a4560efb7808a96c571b2b34665ff8bf..e7a7fef23504e52d5e4dbe28215a2fe191a175f0 100644
--- a/chrome/browser/encoding_menu_controller_unittest.cc
+++ b/chrome/browser/encoding_menu_controller_unittest.cc
@@ -58,7 +58,7 @@ TEST_F(EncodingMenuControllerTest, ListEncodingMenuItems) {
TEST_F(EncodingMenuControllerTest, IsItemChecked) {
TestingProfile profile_en;
- std::wstring encoding(L"UTF-8");
+ std::string encoding("UTF-8");
// Check that enabling and disabling autodetect works.
bool autodetect_enabed[] = {true, false};
@@ -86,7 +86,7 @@ TEST_F(EncodingMenuControllerTest, IsItemChecked) {
ASSERT_FALSE(on && encoding_is_enabled);
encoding_is_enabled |= on;
}
-
+
// Make sure at least one encoding is enabled.
ASSERT_TRUE(encoding_is_enabled);
}
« no previous file with comments | « chrome/browser/encoding_menu_controller.cc ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698