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

Unified Diff: chrome/browser/translate/translate_prefs_unittest.cc

Issue 23522021: Translate: Bug fix: Remove the language sub code when merging to the blocked language list (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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
Index: chrome/browser/translate/translate_prefs_unittest.cc
diff --git a/chrome/browser/translate/translate_prefs_unittest.cc b/chrome/browser/translate/translate_prefs_unittest.cc
index 7c3cf11b149cc23f292b39f5a47372f641617bee..98ba9e4956edf16c8831f80d62b687133f1af7f2 100644
--- a/chrome/browser/translate/translate_prefs_unittest.cc
+++ b/chrome/browser/translate/translate_prefs_unittest.cc
@@ -22,12 +22,16 @@ TEST(TranslatePrefsTest, CreateBlockedLanguages) {
std::vector<std::string> accept_languages;
accept_languages.push_back("en");
+ // The subcode (IT) will be ignored when merging, except for Chinese.
+ accept_languages.push_back("it-IT");
accept_languages.push_back("ja");
// Filippino: synonym to 'tl'
accept_languages.push_back("fil");
// General Chinese is not used as Translate language, but not filtered
// when merging.
accept_languages.push_back("zh");
+ // Chinese with a sub code is acceptable for the blocked-language list.
+ accept_languages.push_back("zh-TW");
std::vector<std::string> blocked_languages;
@@ -41,9 +45,11 @@ TEST(TranslatePrefsTest, CreateBlockedLanguages) {
expected.push_back("fr");
expected.push_back("iw");
expected.push_back("ht");
+ expected.push_back("it");
expected.push_back("ja");
expected.push_back("tl");
expected.push_back("zh");
+ expected.push_back("zh-TW");
EXPECT_EQ(expected.size(), blocked_languages.size());
for (std::vector<std::string>::const_iterator it = expected.begin();
« chrome/browser/translate/translate_prefs.cc ('K') | « chrome/browser/translate/translate_prefs.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698