Support multiple locales string for accept language list

chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java
index 06a4457c356727c274e22c680ef729c36e043e7c..39680b560aecf88684c479b56b9a1cc35f5fd191 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java
@@ -89,6 +89,17 @@ public class PwsClientImplTest extends InstrumentationTestCase {
     }
 
     @SmallTest
+    public void testMultipleLanguageTagIsPrepended() {
+        String locale = "aa_AA,bb_BB";
+        String languageList = "xx-XX,xx,xx-YY";
+
+        // Should prepend the language tag "aa-AA" as well as the language code "aa".
+        String languageListWithTag =
+                PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale, languageList);
+        assertEquals("aa-AA,aa,bb-BB,bb,xx-XX,xx,xx-YY", languageListWithTag);
+    }
+
+    @SmallTest
     public void testLanguageTagIsPrependedWhenListContainsLanguageCode() {
         String locale = new Locale("xx", "XX").toString();
         String languageList = "xx-YY,xx";
@@ -123,6 +134,17 @@ public class PwsClientImplTest extends InstrumentationTestCase {
         String languageList = "xx-XX,xx,xx-YY";
 
         // Language list should be unmodified since the tag is already present.
+        String languageListWithTag =
+                PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale, languageList);

[Seigo Nonaka, 2016/10/05 07:15:41]

You actually didn't change this line. Maybe this is changed by clang-format.
Please revert this?

[Yirui Huang, 2016/10/06 01:17:59]

Done.

+        assertEquals(languageList, languageListWithTag);
+    }
+
+    @SmallTest
+    public void testMultiLanguageTagNotPrependedWhenUnnecessary() {
+        String locale = "xx-XX,yy-YY";
+        String languageList = "xx-XX,xx,yy-YY,yy";
+
+        // Language list should be unmodified since the tag is already present.
         String languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
                 languageList);
         assertEquals(languageList, languageListWithTag);