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

base/logging_win.h

 // Copyright (c) 2009 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.
 
 #ifndef BASE_LOGGING_WIN_H_
 #define BASE_LOGGING_WIN_H_
 #pragma once
 
 #include <string>
 #include "base/basictypes.h"
 #include "base/win/event_trace_provider.h"
 #include "base/logging.h"
+#include "base/singleton.h"

[M-A Ruel, 2010/12/03 21:06:07]

I think you could forward declare the trait instead.

[Satish, 2010/12/04 23:00:40]

Done.

 
 namespace logging {
 
 // Event ID for the log messages we generate.
 extern const GUID kLogEventId;
 
 // Feature enable mask for LogEventProvider.
 enum LogEnableMask {
   // If this bit is set in our provider enable mask, we will include
   // a stack trace with every log message.
@@ skipping 17 matching lines @@
   //  the line number as a four byte integer,
   //  the file as a zero terminated UTF8 string,
   //  the zero-terminated UTF8 message text.
   LOG_MESSAGE_FULL = 12,
 };
 
 // Trace provider class to drive log control and transport
 // with Event Tracing for Windows.
 class LogEventProvider : public base::win::EtwTraceProvider {
  public:
-  LogEventProvider();
+  static LogEventProvider* GetInstance();
 
   static bool LogMessage(logging::LogSeverity severity, const char* file,
       int line, size_t message_start, const std::string& str);
 
   static void Initialize(const GUID& provider_name);
   static void Uninitialize();
 
  protected:
   // Overridden to manipulate the log level on ETW control callbacks.
   virtual void OnEventsEnabled();
   virtual void OnEventsDisabled();
 
  private:
+  LogEventProvider();
+
   // The log severity prior to OnEventsEnabled,
   // restored in OnEventsDisabled.
   logging::LogSeverity old_log_level_;
 
+  friend StaticMemorySingletonTraits<LogEventProvider>;
   DISALLOW_COPY_AND_ASSIGN(LogEventProvider);
 };
 
 }  // namespace logging
 
 #endif  // BASE_LOGGING_WIN_H_