Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

chrome/browser/ui/startup/bad_flags_prompt.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 "chrome/browser/ui/startup/bad_flags_prompt.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 88 matching lines @@
   startup_metric_utils::SetNonBrowserUIDisplayed();
 
   // Ensure the ResourceBundle is initialized for string resource access.
   bool cleanup_resource_bundle = false;
   if (!ResourceBundle::HasSharedInstance()) {
     cleanup_resource_bundle = true;
     std::string locale = l10n_util::GetApplicationLocale(std::string());
     const char kUserDataDirDialogFallbackLocale[] = "en-US";
     if (locale.empty())
       locale = kUserDataDirDialogFallbackLocale;
-    ResourceBundle::InitSharedInstanceWithLocale(locale, NULL);
+    ui::ResourceBundle::InitSharedInstanceWithLocale(
+        locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
   }
 
   const base::string16& title =
       l10n_util::GetStringUTF16(IDS_CANT_WRITE_USER_DIRECTORY_TITLE);
   const base::string16& message =
       l10n_util::GetStringFUTF16(IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY,
                                  user_data_dir.LossyDisplayName());
 
   if (cleanup_resource_bundle)
     ResourceBundle::CleanupSharedInstance();
 
   // More complex dialogs cannot be shown before the earliest calls here.
   ShowMessageBox(NULL, title, message, chrome::MESSAGE_BOX_TYPE_WARNING);
 }
 
 }  // namespace chrome