Index: chrome/browser/android/preferences/pref_service_bridge_unittest.cc |
diff --git a/chrome/browser/android/preferences/pref_service_bridge_unittest.cc b/chrome/browser/android/preferences/pref_service_bridge_unittest.cc |
index 4fb59e8a0b4411b9b5f66847683b7b35e76d6ef6..c1d72f3412a064df4d9445207c24dd85932abf30 100644 |
--- a/chrome/browser/android/preferences/pref_service_bridge_unittest.cc |
+++ b/chrome/browser/android/preferences/pref_service_bridge_unittest.cc |
@@ -21,14 +21,14 @@ class PrefServiceBridgeTest : public testing::Test { |
}; |
TEST_F(PrefServiceBridgeTest, PrependToAcceptLanguagesAsNecessary) { |
- EXPECT_EQ("ms-MY,ms,en-US,en", GetAcceptLanguages("ms-MY", "en-US,en")); |
- EXPECT_EQ("de-CH,de,zh-TW,zh,en-US,en", |
+ EXPECT_EQ("ms-MY,en-US,en", GetAcceptLanguages("ms-MY", "en-US,en")); |
+ EXPECT_EQ("de-CH,zh-TW,en-US,en", |
GetAcceptLanguages("de-CH,zh-TW", "en-US,en")); |
- EXPECT_EQ("de-CH,de,zh-TW,zh,fr-FR,fr,en-US,en", |
+ EXPECT_EQ("de-CH,zh-TW,fr-FR,en-US,en", |
GetAcceptLanguages("de-CH,zh-TW,fr-FR", "en-US,en")); |
// Make sure a country code in number format is inserted. |
- EXPECT_EQ("es-419,es-005,es,en-US,en", |
+ EXPECT_EQ("es-419,es-005,en-US,en", |
GetAcceptLanguages("es-419,es-005", "en-US,en")); |
// Make sure we do not prepend language code even when a language code already |
@@ -36,14 +36,9 @@ TEST_F(PrefServiceBridgeTest, PrependToAcceptLanguagesAsNecessary) { |
EXPECT_EQ("zh-TW,zh-CN,zh", GetAcceptLanguages("zh-TW", "zh-CN,zh")); |
EXPECT_EQ("de-CH,de-DE,de,en-US,en", |
GetAcceptLanguages("de-CH", "de-DE,de,en-US,en")); |
- EXPECT_EQ("en-GB,de-DE,de,en-US,en", |
+ EXPECT_EQ("en-GB,de-DE,en-US,en", |
GetAcceptLanguages("en-GB,de-DE", "en-US,en")); |
- // Make sure a language code is only inserted after the last languageTag that |
- // contains that language. |
- EXPECT_EQ("fr-CA,fr-FR,fr,en-US,en", |
- GetAcceptLanguages("fr-CA,fr-FR", "en-US,en")); |
- |
// If a country code is missing, then only the language code is inserted. |
EXPECT_EQ("ms,en-US,en", GetAcceptLanguages("ms", "en-US,en")); |
EXPECT_EQ("mas,en-US,en", GetAcceptLanguages("mas", "en-US,en")); |
@@ -53,8 +48,8 @@ TEST_F(PrefServiceBridgeTest, |
ShouldNotPrependToAcceptLanguagesWhenNotNecessary) { |
// This logic should not affect cases where original accept language already |
// reflects the language code in the locale. |
- EXPECT_EQ("mas,en-US,en", GetAcceptLanguages("mas", "en-US,en")); |
+ EXPECT_EQ("mas,en-US,en", GetAcceptLanguages("mas", "mas,en-US,en")); |
EXPECT_EQ("en-US,en", GetAcceptLanguages("en-US", "en-US,en")); |
EXPECT_EQ("zh-CN,zh", GetAcceptLanguages("zh-CN", "zh-CN,zh")); |
- EXPECT_EQ("ms-MY,ms,en-US,en", GetAcceptLanguages("ms-MY,en-US", "en-US,en")); |
+ EXPECT_EQ("ms-MY,en-US,en", GetAcceptLanguages("ms-MY,en-US", "en-US,en")); |
} |