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

chrome/browser/ui/cocoa/clear_browsing_data_controller.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/ui/cocoa/clear_browsing_data_controller.h"
 
 #include "app/l10n_util.h"
+#include "base/lazy_instance.h"
 #include "base/mac_util.h"
 #include "base/scoped_nsobject.h"
-#include "base/singleton.h"
 #include "chrome/browser/browsing_data_remover.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_window.h"
 #include "chrome/common/pref_names.h"
 #include "grit/locale_settings.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 NSString* const kClearBrowsingDataControllerDidDelete =
@@ skipping 13 matching lines @@
       : controller_(controller) { }
   void OnBrowsingDataRemoverDone() { [controller_ dataRemoverDidFinish]; }
  private:
   ClearBrowsingDataController* controller_;
 };
 
 namespace {
 
 typedef std::map<Profile*, ClearBrowsingDataController*> ProfileControllerMap;
 
+static base::LazyInstance<ProfileControllerMap> g_profile_controller_map(
+    base::LINKER_INITIALIZED);
+
 } // namespace
 
 @implementation ClearBrowsingDataController
 
 @synthesize clearBrowsingHistory = clearBrowsingHistory_;
 @synthesize clearDownloadHistory = clearDownloadHistory_;
 @synthesize emptyCache = emptyCache_;
 @synthesize deleteCookies = deleteCookies_;
 @synthesize clearSavedPasswords = clearSavedPasswords_;
 @synthesize clearFormData = clearFormData_;
@@ skipping 13 matching lines @@
                      afterDelay:0];
   }
 }
 
 + (ClearBrowsingDataController *)controllerForProfile:(Profile*)profile {
   // Get the original profile in case we get here from an incognito window
   // |GetOriginalProfile()| will return the same profile if it is the original
   // 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()) {
     // Since we don't currently support multiple profiles, this class
     // has not been tested against this case.
     if (map->size() != 0) {
       return nil;
     }
 
     ClearBrowsingDataController* controller =
@@ skipping 110 matching lines @@
   // opening a tab with flash settings.
   [self closeDialog];
 
   Browser* browser = Browser::Create(profile_);
   browser->OpenURL(GURL(l10n_util::GetStringUTF8(IDS_FLASH_STORAGE_URL)),
                    GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
   browser->window()->Show();
 }
 
 - (void)closeDialog {
-  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);
   }
   [self autorelease];
   [[self window] orderOut:self];
   [NSApp stopModal];
 }
 
 // Initialize the bools from prefs using the setters to be KVO-compliant.
@@ skipping 36 matching lines @@
                         object:self
                       userInfo:userInfo];
 
   [self closeDialog];
   [[self window] orderOut:self];
   [self setIsClearing:NO];
   remover_ = NULL;
 }
 
 @end