Extend with a language code in http accept languages

android_webview/browser/net/aw_http_user_agent_settings.cc

Index: android_webview/browser/net/aw_http_user_agent_settings.cc
diff --git a/android_webview/browser/net/aw_http_user_agent_settings.cc b/android_webview/browser/net/aw_http_user_agent_settings.cc
index 6f855f4b0ad2bd25c9a810738f34f0878e0f4d16..54677771f8d55ef8c7ff71fbc277b4a1e3dacdbb 100644
--- a/android_webview/browser/net/aw_http_user_agent_settings.cc
+++ b/android_webview/browser/net/aw_http_user_agent_settings.cc
@@ -8,6 +8,7 @@
 #include "android_webview/common/aw_content_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/http/http_util.h"
+#include "net/http/http_util_icu.h"
 
 namespace android_webview {
 
@@ -25,7 +26,8 @@ std::string AwHttpUserAgentSettings::GetAcceptLanguage() const {
       AwContentBrowserClient::GetAcceptLangsImpl();
   if (new_aw_accept_language != last_aw_accept_language_) {
     last_http_accept_language_ =
-        net::HttpUtil::GenerateAcceptLanguageHeader(new_aw_accept_language);
+        net::http_util_icu::GenerateAcceptLanguageHeader(

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

So I don't think this does the right thing.

Note that our non-ICU platforms are Android and iOS, because the OS already
provides native functionality (or, in the case of Android, is effectively
shipping ICU, just behind a different API)

This is why we have net_string_util_icu_alternatives_* - implementations of the
same function set, for the appropriate platform that is setting "no ICU"

So in order for this to "be right", I believe this function actually needs an
Android-specific, non-ICU dependent solution.

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

I will hand over this issue to nona@. Hopefully, he will take over this part.

+            new_aw_accept_language);
     last_aw_accept_language_ = new_aw_accept_language;
   }
   return last_http_accept_language_;