Switch some Singletons to use LeakySingleton.

base/logging_win.cc

Index: base/logging_win.cc
diff --git a/base/logging_win.cc b/base/logging_win.cc
index d28ce9163bdc0f0628f1757043c18142b5ff3ad3..8070abca2bad2a7899880032f65341921792bf44 100644
--- a/base/logging_win.cc
+++ b/base/logging_win.cc
@@ -41,12 +41,13 @@ struct LogEventProviderTraits {
 intptr_t LogEventProviderTraits::buffer_[kBufferSize];
 base::subtle::Atomic32 LogEventProviderTraits::dead_ = 0;
 
-Singleton<logging::LogEventProvider, LogEventProviderTraits> log_provider;
-
 }  // namespace
 
 namespace logging {
 
+typedef Singleton<LogEventProvider, LogEventProviderTraits>
+    LogEventProviderSingleton;
+
 DEFINE_GUID(kLogEventId,
     0x7fe69228, 0x633e, 0x4f06, 0x80, 0xc1, 0x52, 0x7f, 0xea, 0x23, 0xe3, 0xa7);
 
@@ -75,7 +76,7 @@ bool LogEventProvider::LogMessage(int severity, const std::string& message) {
 
   // Bail if we're not logging, not at that level,
   // or if we're post-atexit handling.
-  LogEventProvider* provider = log_provider.get();
+  LogEventProvider* provider = LogEventProviderSingleton::get();
   if (provider == NULL || level > provider->enable_level())
     return false;
 
@@ -106,7 +107,7 @@ bool LogEventProvider::LogMessage(int severity, const std::string& message) {
 }
 
 void LogEventProvider::Initialize(const GUID& provider_name) {
-  LogEventProvider* provider = log_provider.get();
+  LogEventProvider* provider = LogEventProviderSingleton::get();
 
   provider->set_provider_name(provider_name);
   provider->Register();
@@ -116,7 +117,7 @@ void LogEventProvider::Initialize(const GUID& provider_name) {
 }
 
 void LogEventProvider::Uninitialize() {
-  log_provider.get()->Unregister();
+  LogEventProviderSingleton::get()->Unregister();
 }
 
 void LogEventProvider::OnEventsEnabled() {