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

chrome/browser/extensions/crx_installer.cc

 // 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.
 
 #include "chrome/browser/extensions/crx_installer.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
+#include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
-#include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/task.h"
 #include "base/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/extensions/convert_user_script.h"
@@ skipping 19 matching lines @@
 // would be necessary with PostMessage since file_util::Delete is overloaded.
 static void DeleteFileHelper(const FilePath& path, bool recursive) {
   file_util::Delete(path, recursive);
 }
 
 struct WhitelistedInstallData {
   WhitelistedInstallData() {}
   std::set<std::string> ids;
 };
 
+static base::LazyInstance<WhitelistedInstallData>
+    g_whitelisted_install_data(base::LINKER_INITIALIZED);
+
 }  // namespace
 
 // static
 void CrxInstaller::SetWhitelistedInstallId(const std::string& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  Singleton<WhitelistedInstallData>::get()->ids.insert(id);
+  g_whitelisted_install_data.Get().ids.insert(id);
 }
 
 // static
 bool CrxInstaller::IsIdWhitelisted(const std::string& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  std::set<std::string>& ids = Singleton<WhitelistedInstallData>::get()->ids;
+  std::set<std::string>& ids = g_whitelisted_install_data.Get().ids;
   return ContainsKey(ids, id);
 }
 
 // static
 bool CrxInstaller::ClearWhitelistedInstallId(const std::string& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  std::set<std::string>& ids = Singleton<WhitelistedInstallData>::get()->ids;
+  std::set<std::string>& ids = g_whitelisted_install_data.Get().ids;
   if (ContainsKey(ids, id)) {
     ids.erase(id);
     return true;
   }
   return false;
 }
 
 CrxInstaller::CrxInstaller(ExtensionsService* frontend,
                            ExtensionInstallUI* client)
     : install_directory_(frontend->install_directory()),
@@ skipping 348 matching lines @@
     client_->OnInstallSuccess(extension_.get());
 
   // Tell the frontend about the installation and hand off ownership of
   // extension_ to it.
   frontend_->OnExtensionInstalled(extension_);
   extension_ = NULL;
 
   // We're done. We don't post any more tasks to ourselves so we are deleted
   // soon.
 }