[Android WebView] Fix some locale related TODOs.

Implement AwContentBrowserClient::GetAcceptLangs as the classic
WebView did - use the current local for the primary accept language
and append en-US as an alternative if the primary language was something
else.

Use UTF-8 as the default accept charset.

As far as I can tell
AwContentBrowserClient::GetCanonicalEncodingNameByAliasName should
simply echo the passed in string - we shouldn't get passed anything
other than a canonical encoding name in android_webview/.

Move the mapping of Android deprecated language codes from l10n_util.cc into base/android/java/.../LocaleUtils.java to make that logic easier to reuse by android_webview.

Review URL: https://chromiumcodereview.appspot.com/11614002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174385 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 10 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index c0fb3a6..8b1b827 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -10,6 +10,7 @@
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/common/url_constants.h"
+#include "base/android/locale_utils.h"
 #include "base/base_paths_android.h"
 #include "base/path_service.h"
 #include "content/public/browser/access_token_store.h"
@@ -89,8 +90,6 @@ void AwContentBrowserClient::RenderProcessHostCreated(
 
 std::string AwContentBrowserClient::GetCanonicalEncodingNameByAliasName(
     const std::string& alias_name) {
-  // TODO(boliu): Call to icu here? Compotentize character_encoding.cc?
-  NOTIMPLEMENTED();
   return alias_name;
 }
 
@@ -101,16 +100,20 @@ void AwContentBrowserClient::AppendExtraCommandLineSwitches(
 }
 
 std::string AwContentBrowserClient::GetApplicationLocale() {
-  // TODO(boliu): Read Android system locale.
-  NOTIMPLEMENTED();
-  return "en-US";
+  return base::android::GetDefaultLocale();
 }
 
 std::string AwContentBrowserClient::GetAcceptLangs(
     content::BrowserContext* context) {
-  // TODO(boliu): Read Android system locale.
-  NOTIMPLEMENTED();
-  return "en-GB,en-US,en";
+  // Start with the currnet locale.
+  std::string langs = GetApplicationLocale();
+
+  // If we're not en-US, add in en-US which will be
+  // used with a lower q-value.
+  if (StringToLowerASCII(langs) != "en-us") {
+    langs += ",en-US";
+  }
+  return langs;
 }
 
 gfx::ImageSkia* AwContentBrowserClient::GetDefaultFavicon() {
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 92b10e1..b6d3d25 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -89,9 +89,8 @@ void AwURLRequestContextGetter::Init() {
       content::GetContentClient()->browser()->GetAcceptLangs(
           browser_context_)));
 
-  // TODO(boliu): Values from chrome/app/resources/locale_settings_en-GB.xtb
   builder.set_accept_charset(
-      net::HttpUtil::GenerateAcceptCharsetHeader("ISO-8859-1"));
+      net::HttpUtil::GenerateAcceptCharsetHeader("utf-8"));
 
   url_request_context_.reset(builder.Build());