Extend with a language code in http accept languages

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 3b306c8c27e314d293f0840f006970cd91054030..04c3f6d4d8d48904b7769b1ce7753cf5c87b0436 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
@@ -61,10 +61,9 @@ public class PwsClientImplTest extends InstrumentationTestCase {
         String defaultLocale = LocaleUtils.toLanguageTag(locale);
         String languageList = "fr-CA,fr-FR,fr";
 
-        // Should prepend the language tag "en-GB" as well as the language code "en".

[Ryan Sleevi, 2016/12/15 23:44:07]

Why should "en" no longer be added?

[Yirui Huang, 2016/12/16 08:00:08]

From both Android Chrome and Webview, we are returning a language list that
contains unique language tags in this patch. And we try to add language code
like "en" in net/http instead of adding individually according to platforms. 

         String languageListWithTag =
                 PwsClientImpl.prependToAcceptLanguagesIfNecessary(defaultLocale, languageList);
-        assertEquals("en-GB,en,fr-CA,fr-FR,fr", languageListWithTag);
+        assertEquals("en-GB,fr-CA,fr-FR,fr", languageListWithTag);
     }
 
     @SmallTest
@@ -73,7 +72,7 @@ public class PwsClientImplTest extends InstrumentationTestCase {
         String defaultLocale = LocaleUtils.toLanguageTag(locale);
         String languageList = "fr-CA,fr-FR,fr";
 
-        // Should prepend the language code only language tag "aaa".
+        // Should prepend the language code only.
         String languageListWithTag =
                 PwsClientImpl.prependToAcceptLanguagesIfNecessary(defaultLocale, languageList);
         assertEquals("mas,fr-CA,fr-FR,fr", languageListWithTag);
@@ -85,10 +84,9 @@ public class PwsClientImplTest extends InstrumentationTestCase {
         String defaultLocale = LocaleUtils.toLanguageTag(locale);
         String languageList = "fr-CA,fr-FR,fr";
 
-        // Should prepend the language tag "aa-AAA" as well as the language code "aa".
         String languageListWithTag =
                 PwsClientImpl.prependToAcceptLanguagesIfNecessary(defaultLocale, languageList);
-        assertEquals("es-005,es,fr-CA,fr-FR,fr", languageListWithTag);
+        assertEquals("es-005,fr-CA,fr-FR,fr", languageListWithTag);
     }
 
     @SmallTest
@@ -96,17 +94,9 @@ public class PwsClientImplTest extends InstrumentationTestCase {
         String locale = "jp-JP,is-IS";
         String languageList = "en-US,en";
 
-        // Should prepend the language tag "aa-AA" as well as the language code "aa".
         String languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
                 languageList);
-        assertEquals("jp-JP,jp,is-IS,is,en-US,en", languageListWithTag);
-
-        // Make sure the language code is only inserted after the last languageTag that
-        // contains that language.
-        locale = "jp-JP,fr-CA,fr-FR";
-        languageListWithTag =
-                PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale, languageList);
-        assertEquals("jp-JP,jp,fr-CA,fr-FR,fr,en-US,en", languageListWithTag);
+        assertEquals("jp-JP,is-IS,en-US,en", languageListWithTag);
     }
 
     @SmallTest