[Android] Move LocaleUtils from base to ui.

As of https://chromiumcodereview.appspot.com/12665004, LocaleUtils depends on base_i18n
and hence can't live in base anymore. This is actually a better place for it as it's
alongside similar code for other ports.

BUG=158821
TBR=ben,mark

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

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

3 files changed, 6 insertions, 5 deletions

diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 338ba4b..60eb77c 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -8,7 +8,6 @@
 #include "android_webview/browser/aw_devtools_delegate.h"
 #include "android_webview/browser/aw_result_codes.h"
 #include "base/android/build_info.h"
-#include "base/android/locale_utils.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "content/public/browser/android/compositor.h"
@@ -17,6 +16,7 @@
 #include "content/public/common/result_codes.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/network_change_notifier.h"
+#include "ui/base/l10n/l10n_util_android.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
@@ -51,7 +51,7 @@ int AwBrowserMainParts::PreCreateThreads() {
   browser_context_->InitializeBeforeThreadCreation();
 
   ui::ResourceBundle::InitSharedInstanceLocaleOnly(
-      base::android::GetDefaultLocale(), NULL);
+      l10n_util::GetDefaultLocale(), NULL);
 
   base::FilePath pak_path;
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_path);
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index a5ff403..137a482 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -13,7 +13,6 @@
 #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"
@@ -24,6 +23,7 @@
 #include "grit/ui_resources.h"
 #include "net/android/network_library.h"
 #include "net/ssl/ssl_info.h"
+#include "ui/base/l10n/l10n_util_android.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace android_webview {
@@ -56,7 +56,7 @@ class AwAccessTokenStore : public content::AccessTokenStore {
 
 std::string AwContentBrowserClient::GetAcceptLangsImpl() {
   // Start with the currnet locale.
-  std::string langs = base::android::GetDefaultLocale();
+  std::string langs = l10n_util::GetDefaultLocale();
 
   // If we're not en-US, add in en-US which will be
   // used with a lower q-value.
@@ -155,7 +155,7 @@ void AwContentBrowserClient::AppendExtraCommandLineSwitches(
 }
 
 std::string AwContentBrowserClient::GetApplicationLocale() {
-  return base::android::GetDefaultLocale();
+  return l10n_util::GetDefaultLocale();
 }
 
 std::string AwContentBrowserClient::GetAcceptLangs(
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 594da68..1d5d659 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -16,6 +16,7 @@
         '../../cc/cc.gyp:cc',
         '../../net/net.gyp:net',
         '../../skia/skia.gyp:skia',
+        '../../ui/ui.gyp:ui',
         '../../webkit/support/webkit_support.gyp:user_agent',
         '../../webkit/support/webkit_support.gyp:webkit_storage',
         'android_webview_native_jni',