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

Unified Diff: chrome/browser/chromeos/options/language_config_model_unittest.cc

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 years, 4 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/chromeos/options/language_config_model_unittest.cc
diff --git a/chrome/browser/chromeos/options/language_config_model_unittest.cc b/chrome/browser/chromeos/options/language_config_model_unittest.cc
index e9b593d6cf728ac883f936e2c5f729211f305f89..0d7e12f683273d05473112a301b5fabbe1b763ba 100644
--- a/chrome/browser/chromeos/options/language_config_model_unittest.cc
+++ b/chrome/browser/chromeos/options/language_config_model_unittest.cc
@@ -26,18 +26,18 @@ TEST(AddLanguageComboboxModelTest, AddLanguageComboboxModel) {
ASSERT_EQ(4, model.GetItemCount());
// The first item should be "Add language" labe.
- EXPECT_EQ(l10n_util::GetString(
+ EXPECT_EQ(l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_LANGUAGE_COMBOBOX),
model.GetItemAt(0));
// Other items should be sorted language display names for UI (hence
// French comes before German). Note that the returned display names
// are followed by their native representations. To simplify matching,
// use StartsWith() here.
- EXPECT_TRUE(StartsWith(model.GetItemAt(1), L"French", true))
+ EXPECT_TRUE(StartsWith(model.GetItemAt(1), ASCIIToUTF16("French"), true))
<< model.GetItemAt(1);
- EXPECT_TRUE(StartsWith(model.GetItemAt(2), L"German", true))
+ EXPECT_TRUE(StartsWith(model.GetItemAt(2), ASCIIToUTF16("German"), true))
<< model.GetItemAt(2);
- EXPECT_TRUE(StartsWith(model.GetItemAt(3), L"Korean", true))
+ EXPECT_TRUE(StartsWith(model.GetItemAt(3), ASCIIToUTF16("Korean"), true))
<< model.GetItemAt(3);
// GetLanguageIndex() returns the given index -1 to offset "Add language".
« no previous file with comments | « chrome/browser/chromeos/options/language_config_model.cc ('k') | chrome/browser/chromeos/options/language_config_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698