Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

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"
@@ skipping 38 matching lines @@
 int AwBrowserMainParts::PreCreateThreads() {
   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::InitSharedInstanceLocaleOnly(
-      l10n_util::GetDefaultLocale(), NULL);
+  ui::ResourceBundle::InitSharedInstanceWithLocale(
+      l10n_util::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 {
     LOG(WARNING) << "Failed to load " << locale << ".pak from the apk too. "
                     "Bringing up WebView without any locale";
@@ skipping 38 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