Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / base / l10n / l10n_util.cc

diff --git a/src/ui/base/l10n/l10n_util.cc b/src/ui/base/l10n/l10n_util.cc
index 17290e8..f931a6b 100644 (file)
--- a/src/ui/base/l10n/l10n_util.cc
+++ b/src/ui/base/l10n/l10n_util.cc
@@ -17,7 +17,6 @@
 #include "base/i18n/string_compare.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ -33,6 +32,7 @@
 #include "ui/base/ui_base_paths.h"
 
 #if defined(OS_ANDROID)
+#include "base/android/locale_utils.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #endif
 
@@ -388,7 +388,7 @@ bool CheckAndResolveLocale(const std::string& locale,
       {"en", "en-US"},
   };
 
-  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(alias_map); ++i) {
+  for (size_t i = 0; i < arraysize(alias_map); ++i) {
     if (LowerCaseEqualsASCII(lang, alias_map[i].source)) {
       std::string tmp_locale(alias_map[i].dest);
       if (IsLocaleAvailable(tmp_locale)) {
@@ -448,7 +448,7 @@ std::string GetApplicationLocaleInternal(const std::string& pref_locale) {
 #elif defined(OS_ANDROID)
 
   // On Android, query java.util.Locale for the default locale.
-  candidates.push_back(GetDefaultLocale());
+  candidates.push_back(base::android::GetDefaultLocale());
 
 #elif defined(USE_GLIB) && !defined(OS_CHROMEOS)