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

chrome/browser/autofill/autofill_dialog_controller_mac.mm

 // Copyright (c) 2010 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 "chrome/browser/autofill/autofill_dialog_controller_mac.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/lazy_instance.h"
 #include "base/mac_util.h"
-#include "base/singleton.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/autofill/autofill_address_model_mac.h"
 #import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_model_mac.h"
 #import "chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.h"
 #import "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
 // Type for singleton object that contains the instance of the visible
 // dialog.
 typedef std::map<Profile*, AutoFillDialogController*> ProfileControllerMap;
 
+static base::LazyInstance<ProfileControllerMap> g_profile_controller_map(
+    base::LINKER_INITIALIZED);
+
 }  // namespace
 
 // Delegate protocol that needs to be in place for the AutoFillTableView's
 // handling of delete and backspace keys.
 @protocol DeleteKeyDelegate
 - (IBAction)deleteSelection:(id)sender;
 @end
 
 // A subclass of NSTableView that allows for deleting selected elements using
 // the delete or backspace keys.
@@ skipping 216 matching lines @@
 }
 
 // NSWindow Delegate callback.  When the window closes the controller can
 // be released.
 - (void)windowWillClose:(NSNotification *)notification {
   [tableView_ setDataSource:nil];
   [tableView_ setDelegate:nil];
   [self autorelease];
 
   // Remove ourself from the map.
-  ProfileControllerMap* map = Singleton<ProfileControllerMap>::get();
+  ProfileControllerMap* map = g_profile_controller_map.Pointer();
   ProfileControllerMap::iterator it = map->find(profile_);
   if (it != map->end()) {
     map->erase(it);
   }
 }
 
 // Invokes the "Add" sheet for address information.  If user saves then the new
 // information is added to |profiles_| in |addressAddDidEnd:| method.
 - (IBAction)addNewAddress:(id)sender {
   DCHECK(!addressSheetController.get());
@@ skipping 344 matching lines @@
 
 @end
 
 @implementation AutoFillDialogController (ExposedForUnitTests)
 
 + (AutoFillDialogController*)
     controllerWithObserver:(AutoFillDialogObserver*)observer
                    profile:(Profile*)profile {
   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()) {
     // We should have exactly 1 or 0 entry in the map, no more.  That is,
     // only one profile can have the AutoFill dialog up at a time.
     DCHECK_EQ(map->size(), 0U);
 
   // Deallocation is done upon window close.  See |windowWillClose:|.
   AutoFillDialogController* controller =
       [[self alloc] initWithObserver:observer profile:profile];
@@ skipping 255 matching lines @@
   if (!image) {
     image = rb.GetNativeImageNamed(IDR_INPUT_GOOD);
     DCHECK(image);
     return image;
   }
 
   return nil;
 }
 
 @end