Support multiple locales string for accept language list

chrome/browser/android/preferences/pref_service_bridge_unittest.cc

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 c73a998ec74228e8bcdd17d25efdd895bc30139a..94506f74b128bcff53da8acc80e970c22f08b7b9 100644
--- a/chrome/browser/android/preferences/pref_service_bridge_unittest.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge_unittest.cc
@@ -22,13 +22,23 @@ 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",
+            GetAcceptLanguages("de_CH,zh_TW", "en-US,en"));
+  EXPECT_EQ("de-CH,de,zh-TW,zh,fr-FR,fr,en-US,en",
+            GetAcceptLanguages("de_CH,zh_TW,fr_FR", "en-US,en"));
 
-  EXPECT_EQ("de-CH,de-DE,de,en-US,en",
-      GetAcceptLanguages("de_CH", "de-DE,de,en-US,en"));
-
-  // Make sure we do not prepend language code even when a language code is at
-  // the end.
+  // Make sure we do not prepend language code even when a language code already
+  // exists.
   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",
+            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"));
 }
 
 TEST_F(PrefServiceBridgeTest,
@@ -38,11 +48,14 @@ TEST_F(PrefServiceBridgeTest,
   // Hebrew.
   EXPECT_EQ("he-IL,he,en-US,en",
       GetAcceptLanguages("iw_IL", "he-IL,he,en-US,en"));
+  EXPECT_EQ("he-IL,he,fr-FR,fr,en-US,en",
+            GetAcceptLanguages("iw_IL,fr_FR", "en-US,en"));
 
   // This logic should not affect cases where original accept language already
   // reflects the language code in the locale.
   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"));
 
   // "ms" is not expected. No replacement takes place.
   EXPECT_EQ("en-US,en", GetAcceptLanguages("ms", "en-US,en"));