[Android] Simplify logic for grabbing initial country-code.

android_webview/browser/aw_browser_main_parts.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_result_codes.h"
 #include "android_webview/native/aw_assets.h"
 #include "base/android/build_info.h"
+#include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_utils.h"
 #include "gpu/command_buffer/service/mailbox_synchronizer.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/l10n/l10n_util.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"
 
 namespace android_webview {
 
 AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context)
     : browser_context_(browser_context) {
 }
 
@@ skipping 15 matching lines @@
   int pak_fd = 0;
   int64 pak_off = 0;
   int64 pak_len = 0;
 
   // TODO(primiano, mkosiba): GetApplicationLocale requires a ResourceBundle
   // instance to be present to work correctly so we call this (knowing it will
   // fail) just to create the ResourceBundle instance. We should refactor
   // ResourceBundle/GetApplicationLocale to not require an instance to be
   // initialized.
   ui::ResourceBundle::InitSharedInstanceWithLocale(
-      l10n_util::GetDefaultLocale(),
+      base::android::GetDefaultLocale(),
       NULL,
       ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
   std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak";
   if (AwAssets::OpenAsset(locale, &pak_fd, &pak_off, &pak_len)) {
     VLOG(0) << "Load from apk succesful, fd=" << pak_fd << " off=" << pak_off
             << " len=" << pak_len;
     ui::ResourceBundle::CleanupSharedInstance();
     ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
         base::File(pak_fd), base::MemoryMappedFile::Region(pak_off, pak_len));
   } else {
@@ skipping 40 matching lines @@
   content::SetMaxURLChars(20 * 1024 * 1024);
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview