Add a new GetInstance() method for remaining files with singleton classes under chrome/browser.

chrome/browser/chromeos/input_method/input_method_util.cc

Index: chrome/browser/chromeos/input_method/input_method_util.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index 9f8811d124e02688ea4a5f5fc40f463ce97c4327..fbc904baca0e6ea074a76968becb15c86b4767c7 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -109,6 +109,11 @@ struct IdMaps {
   scoped_ptr<std::map<std::string, std::string> > id_to_display_name;
   scoped_ptr<std::map<std::string, std::string> > id_to_keyboard_overlay_id;
 
+  // Returns the singleton instance.
+  static IdMaps* GetInstance() {
+    return Singleton<IdMaps>::get();
+  }
+
   void ReloadMaps() {
     chromeos::InputMethodLibrary* library =
         chromeos::CrosLibrary::Get()->GetInputMethodLibrary();
@@ -536,8 +541,8 @@ std::string GetLanguageCodeFromInputMethodId(
   // defined in app/l10_util.cc.
   const char kDefaultLanguageCode[] = "en-US";
   std::map<std::string, std::string>::const_iterator iter
-      = Singleton<IdMaps>::get()->id_to_language_code->find(input_method_id);
-  return (iter == Singleton<IdMaps>::get()->id_to_language_code->end()) ?
+      = IdMaps::GetInstance()->id_to_language_code->find(input_method_id);
+  return (iter == IdMaps::GetInstance()->id_to_language_code->end()) ?
       // Returning |kDefaultLanguageCode| here is not for Chrome OS but for
       // Ubuntu where the ibus-xkb-layouts engine could be missing.
       kDefaultLanguageCode : iter->second;
@@ -555,7 +560,7 @@ std::string GetKeyboardLayoutName(const std::string& input_method_id) {
 
 std::string GetKeyboardOverlayId(const std::string& input_method_id) {
   const std::map<std::string, std::string>& id_map =
-      *(Singleton<IdMaps>::get()->id_to_keyboard_overlay_id);
+      *(IdMaps::GetInstance()->id_to_keyboard_overlay_id);
   std::map<std::string, std::string>::const_iterator iter =
       id_map.find(input_method_id);
   return (iter == id_map.end() ? "" : iter->second);
@@ -565,8 +570,8 @@ std::string GetInputMethodDisplayNameFromId(
     const std::string& input_method_id) {
   static const char kDefaultDisplayName[] = "USA";
   std::map<std::string, std::string>::const_iterator iter
-      = Singleton<IdMaps>::get()->id_to_display_name->find(input_method_id);
-  return (iter == Singleton<IdMaps>::get()->id_to_display_name->end()) ?
+      = IdMaps::GetInstance()->id_to_display_name->find(input_method_id);
+  return (iter == IdMaps::GetInstance()->id_to_display_name->end()) ?
       kDefaultDisplayName : iter->second;
 }
 
@@ -603,7 +608,7 @@ void SortLanguageCodesByNames(std::vector<std::string>* language_codes) {
 
 void SortInputMethodIdsByNames(std::vector<std::string>* input_method_ids) {
   SortInputMethodIdsByNamesInternal(
-      *(Singleton<IdMaps>::get()->id_to_language_code), input_method_ids);
+      *(IdMaps::GetInstance()->id_to_language_code), input_method_ids);
 }
 
 void SortInputMethodIdsByNamesInternal(
@@ -629,7 +634,7 @@ bool GetInputMethodIdsFromLanguageCode(
     InputMethodType type,
     std::vector<std::string>* out_input_method_ids) {
   return GetInputMethodIdsFromLanguageCodeInternal(
-      *Singleton<IdMaps>::get()->language_code_to_ids,
+      *IdMaps::GetInstance()->language_code_to_ids,
       normalized_language_code, type, out_input_method_ids);
 }
 
@@ -687,7 +692,7 @@ void EnableInputMethods(const std::string& language_code, InputMethodType type,
 }
 
 void OnLocaleChanged() {
-  Singleton<IdMaps>::get()->ReloadMaps();
+  IdMaps::GetInstance()->ReloadMaps();
 }
 
 }  // namespace input_method