Extend with a language code in http accept languages

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.physicalweb;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
@@ skipping 43 matching lines @@
                     || acceptLanguage.equals(languageCode));
         }
     }
 
     @SmallTest
     public void testLanguageTagIsPrepended() {
         Locale locale = new Locale("en", "GB");
         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
     public void testLanguageOnlyTagIsPrepended() {
         Locale locale = new Locale("mas");
         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);
     }
 
     @SmallTest
     public void testSpecialLengthCountryCodeIsPrepended() {
         Locale locale = new Locale("es", "005");
         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
     public void testMultipleLanguageTagIsPrepended() {
         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
     public void testLanguageTagIsPrependedWhenListContainsLanguageCode() {
         Locale locale = new Locale("fr", "FR");
         String defaultLocale = LocaleUtils.toLanguageTag(locale);
         String languageList = "fr-CA,fr";
 
         // Should prepend the language tag "xx-XX" but not the language code "xx" as it's already
         // included at the end of the list.
@@ skipping 34 matching lines @@
         String acceptLanguage = PwsClientImpl.generateAcceptLanguageHeader(languageList);
         assertEquals("en-US,en-GB;q=0.8,en;q=0.6,jp-JP;q=0.4,jp;q=0.2", acceptLanguage);
 
         // When there are six or more items, the q-value should not go below 0.2.
         languageList = "mas,es,en,jp,ch,fr";
         acceptLanguage = PwsClientImpl.generateAcceptLanguageHeader(languageList);
         assertEquals("mas,es;q=0.8,en;q=0.6,jp;q=0.4,ch;q=0.2,fr;q=0.2",
                 acceptLanguage);
     }
 }