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

chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.mm

 // Copyright (c) 2009 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h"
 
 #import "base/mac_util.h"
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_table_model.h"
 #import "chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
@@ skipping 73 matching lines @@
 NSImage* KeywordEditorModelObserver::GetImageForRow(int row) {
   return icon_cache_.GetImageForRow(row);
 }
 
 // KeywordEditorCocoaController -----------------------------------------------
 
 namespace {
 
 typedef std::map<Profile*,KeywordEditorCocoaController*> ProfileControllerMap;
 
+static base::LazyInstance<ProfileControllerMap> g_profile_controller_map(
+    base::LINKER_INITIALIZED);
+
 }  // namespace
 
 @implementation KeywordEditorCocoaController
 
 + (KeywordEditorCocoaController*)sharedInstanceForProfile:(Profile*)profile {
-  ProfileControllerMap* map = Singleton<ProfileControllerMap>::get();
+  ProfileControllerMap* map = g_profile_controller_map.Pointer();
   DCHECK(map != NULL);
   ProfileControllerMap::iterator it = map->find(profile);
   if (it != map->end()) {
     return it->second;
   }
   return nil;
 }
 
 // TODO(shess): The Windows code watches a single global window which
 // is not distinguished by profile.  This code could distinguish by
 // profile by checking the controller's class and profile.
 + (void)showKeywordEditor:(Profile*)profile {
   // http://crbug.com/23359 describes a case where this panel is
   // opened from an incognito window, which can leave the panel
   // holding onto a stale profile.  Since the same panel is used
   // either way, arrange to use the original profile instead.
   profile = profile->GetOriginalProfile();
 
-  ProfileControllerMap* map = Singleton<ProfileControllerMap>::get();
+  ProfileControllerMap* map = g_profile_controller_map.Pointer();
   DCHECK(map != NULL);
   ProfileControllerMap::iterator it = map->find(profile);
   if (it == map->end()) {
     // Since we don't currently support multiple profiles, this class
     // has not been tested against them, so document that assumption.
     DCHECK_EQ(map->size(), 0U);
 
     KeywordEditorCocoaController* controller =
         [[self alloc] initWithProfile:profile];
     it = map->insert(std::make_pair(profile, controller)).first;
@@ skipping 48 matching lines @@
 
   [self adjustEditingButtons];
   [tableView_ setDoubleAction:@selector(editKeyword:)];
   [tableView_ setTarget:self];
 }
 
 // When the window closes, clean ourselves up.
 - (void)windowWillClose:(NSNotification*)notif {
   [self autorelease];
 
-  ProfileControllerMap* map = Singleton<ProfileControllerMap>::get();
+  ProfileControllerMap* map = g_profile_controller_map.Pointer();
   ProfileControllerMap::iterator it = map->find(profile_);
   // It should not be possible for this to be missing.
   // TODO(shess): Except that the unit test reaches in directly.
   // Consider circling around and refactoring that.
   //DCHECK(it != map->end());
   if (it != map->end()) {
     map->erase(it);
   }
 }
 
@@ skipping 205 matching lines @@
       controller_->table_model()->last_search_engine_index() + 1;
   DCHECK_NE(row, otherGroupId);
   if (row >= otherGroupId) {
     return row - 2;  // Other group.
   } else {
     return row - 1;  // Default group.
   }
 }
 
 @end