Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

ui/base/resource/resource_bundle.h

 // 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.
 
 #ifndef UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 #define UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_
 
 #include <map>
 #include <string>
 
@@ skipping 106 matching lines @@
 
   // Initialize the ResourceBundle for this process. Does not take ownership of
   // the |delegate| value. Returns the language selected.
   // NOTE: Mac ignores this and always loads up resources for the language
   // defined by the Cocoa UI (i.e., NSBundle does the language work).
   //
   // TODO(sergeyu): This method also loads common resources (i.e. chrome.pak).
   // 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.
   // |should_load_common_resources| controls whether or not LoadCommonResources
   // is called.
   // This allows the use of this function in a sandbox without local file
   // access (as on Android).
   static void InitSharedInstanceWithPakFileRegion(
       base::File pak_file,
       const base::MemoryMappedFile::Region& region,
@@ skipping 277 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
 };
 
 }  // namespace ui
 
 // TODO(beng): Someday, maybe, get rid of this.
 using ui::ResourceBundle;
 
 #endif  // UI_BASE_RESOURCE_RESOURCE_BUNDLE_H_