Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

ui/base/resource/resource_bundle.h

Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index b0e9cdb1738bf4fa6df2c116e1929eb90eff3ad4..e552ee62099a5ac89cf5fe2d1b5adcd248624858 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -124,13 +124,12 @@ class UI_BASE_EXPORT ResourceBundle {
   // There is no way to specify which resource files are loaded, i.e. names of
   // the files are hardcoded in ResourceBundle. Fix it to allow to specify which
   // files are loaded (e.g. add a new method in Delegate).
+  // |should_load_common_resources| controls whether or not LoadCommonResources
+  // is called.
   static std::string InitSharedInstanceWithLocale(
-      const std::string& pref_locale, Delegate* delegate);
-
-  // Same as InitSharedInstanceWithLocale(), but loads only localized resources,
-  // without default resource packs.
-  static std::string InitSharedInstanceLocaleOnly(
-      const std::string& pref_locale, Delegate* delegate);
+      const std::string& pref_locale,
+      Delegate* delegate,
+      bool should_load_common_resources);

[tony, 2014/08/11 16:25:56]

It would be better if this were an enum { LOAD_COMMON_RESOURCES,
DO_NOT_LOAD_COMMON_RESOURCES } to make the call sites easier to read.

[tfarina, 2014/08/12 04:01:01]

Done.

 
   // Initialize the ResourceBundle using the given file region. If |region| is
   // MemoryMappedFile::Region::kWholeFile, the entire |pak_file| is used.