Extend with a language code in http accept languages

ios/chrome/browser/net/ios_chrome_http_user_agent_settings.mm

Index: ios/chrome/browser/net/ios_chrome_http_user_agent_settings.mm
diff --git a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.mm b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.mm
index 6a4c675bd02c9c6109a7101654e5428e8aefc63f..8b411466e7c35232bf33ab4245820ed8e2d7f956 100644
--- a/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.mm
+++ b/ios/chrome/browser/net/ios_chrome_http_user_agent_settings.mm
@@ -9,6 +9,7 @@
 #include "ios/web/public/web_client.h"
 #include "ios/web/public/web_thread.h"
 #include "net/http/http_util.h"

[Seigo Nonaka, 2016/12/14 01:27:21]

nit: Please remove

[Yirui Huang, 2016/12/14 01:53:09]

Done.

+#include "net/http/http_util_icu.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
@@ -19,8 +20,8 @@ IOSChromeHttpUserAgentSettings::IOSChromeHttpUserAgentSettings(
   DCHECK_CURRENTLY_ON(web::WebThread::UI);
   pref_accept_language_.Init(prefs::kAcceptLanguages, prefs);
   last_pref_accept_language_ = *pref_accept_language_;
-  last_http_accept_language_ =
-      net::HttpUtil::GenerateAcceptLanguageHeader(last_pref_accept_language_);
+  last_http_accept_language_ = net::HttpUtilIcu::GenerateAcceptLanguageHeader(
+      last_pref_accept_language_);
   pref_accept_language_.MoveToThread(
       web::WebThread::GetTaskRunnerForThread(web::WebThread::IO));
 }
@@ -38,8 +39,8 @@ std::string IOSChromeHttpUserAgentSettings::GetAcceptLanguage() const {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   std::string new_pref_accept_language = *pref_accept_language_;
   if (new_pref_accept_language != last_pref_accept_language_) {
-    last_http_accept_language_ =
-        net::HttpUtil::GenerateAcceptLanguageHeader(new_pref_accept_language);
+    last_http_accept_language_ = net::HttpUtilIcu::GenerateAcceptLanguageHeader(
+        new_pref_accept_language);
     last_pref_accept_language_ = new_pref_accept_language;
   }
   return last_http_accept_language_;