Access singletons with a new GetInstance() method instead of Singleton<T>.

base/logging_win.cc

Index: base/logging_win.cc
diff --git a/base/logging_win.cc b/base/logging_win.cc
index 42610b56197ebe1e3eb0ce44b2cd671b62dd318e..ebdecf2c4919ba439d9445633f5da9840a6d76be 100644
--- a/base/logging_win.cc
+++ b/base/logging_win.cc
@@ -3,17 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/logging_win.h"
-#include "base/singleton.h"
 #include <initguid.h>  // NOLINT
 
-namespace {
-
-typedef StaticMemorySingletonTraits<logging::LogEventProvider>
-    LogEventSingletonTraits;
-Singleton<logging::LogEventProvider, LogEventSingletonTraits> log_provider;
-
-}  // namespace
-
 namespace logging {
 
 using base::win::EtwEventLevel;
@@ -25,6 +16,11 @@ DEFINE_GUID(kLogEventId,
 LogEventProvider::LogEventProvider() : old_log_level_(LOG_NONE) {
 }
 
+LogEventProvider* LogEventProvider::GetInstance() {
+  return Singleton<LogEventProvider,
+                   StaticMemorySingletonTraits<LogEventProvider> >::get();
+}
+
 bool LogEventProvider::LogMessage(logging::LogSeverity severity,
     const char* file, int line, size_t message_start,
     const std::string& message) {
@@ -53,7 +49,7 @@ bool LogEventProvider::LogMessage(logging::LogSeverity severity,
 
   // Bail if we're not logging, not at that level,
   // or if we're post-atexit handling.
-  LogEventProvider* provider = log_provider.get();
+  LogEventProvider* provider = LogEventProvider::GetInstance();
   if (provider == NULL || level > provider->enable_level())
     return false;
 
@@ -100,7 +96,7 @@ bool LogEventProvider::LogMessage(logging::LogSeverity severity,
 }
 
 void LogEventProvider::Initialize(const GUID& provider_name) {
-  LogEventProvider* provider = log_provider.get();
+  LogEventProvider* provider = LogEventProvider::GetInstance();
 
   provider->set_provider_name(provider_name);
   provider->Register();
@@ -110,7 +106,7 @@ void LogEventProvider::Initialize(const GUID& provider_name) {
 }
 
 void LogEventProvider::Uninitialize() {
-  log_provider.get()->Unregister();
+  LogEventProvider::GetInstance()->Unregister();
 }
 
 void LogEventProvider::OnEventsEnabled() {