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

base/debug/trace_event.h

 // 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.
 
 // Trace events to track application performance.  Events consist of a name
 // a type (BEGIN, END or INSTANT), a tracking id and extra string data.
 // In addition, the current process id, thread id, a timestamp down to the
 // microsecond and a file and line number of the calling location.
 //
 // The current implementation logs these events into a log file of the form
@@ skipping 34 matching lines @@
 #else  // CHROMIUM_ENABLE_TRACE_EVENT
 // Use the following macros rather than using the TraceLog class directly as the
 // underlying implementation may change in the future.  Here's a sample usage:
 // TRACE_EVENT_BEGIN("v8.run", documentId, scriptLocation);
 // RunScript(script);
 // TRACE_EVENT_END("v8.run", documentId, scriptLocation);
 
 // Record that an event (of name, id) has begun.  All BEGIN events should have
 // corresponding END events with a matching (name, id).
 #define TRACE_EVENT_BEGIN(name, id, extra) \
-  Singleton<base::debug::TraceLog>::get()->Trace( \
+  base::debug::TraceLog::GetInstance()->Trace( \
       name, \
       base::debug::TraceLog::EVENT_BEGIN, \
       reinterpret_cast<const void*>(id), \
       extra, \
       __FILE__, \
       __LINE__)
 
 // Record that an event (of name, id) has ended.  All END events should have
 // corresponding BEGIN events with a matching (name, id).
 #define TRACE_EVENT_END(name, id, extra) \
-  Singleton<base::debug::TraceLog>::get()->Trace( \
+  base::debug::TraceLog::GetInstance()->Trace( \
       name, \
       base::debug::TraceLog::EVENT_END, \
       reinterpret_cast<const void*>(id), \
       extra, \
       __FILE__, \
       __LINE__)
 
 // Record that an event (of name, id) with no duration has happened.
 #define TRACE_EVENT_INSTANT(name, id, extra) \
-  Singleton<base::debug::TraceLog>::get()->Trace( \
+  base::debug::TraceLog::GetInstance()->Trace( \
       name, \
       base::debug::TraceLog::EVENT_INSTANT, \
       reinterpret_cast<const void*>(id), \
       extra, \
       __FILE__, \
       __LINE__)
 #endif  // CHROMIUM_ENABLE_TRACE_EVENT
 
 namespace base {
 
 class ProcessMetrics;
 
 namespace debug {
 
 class TraceLog {
  public:
   enum EventType {
     EVENT_BEGIN,
     EVENT_END,
     EVENT_INSTANT
   };
 
+  static TraceLog* GetInstance();
+
   // Is tracing currently enabled.
   static bool IsTracing();
   // Start logging trace events.
   static bool StartTracing();
   // Stop logging trace events.
   static void StopTracing();
 
   // Log a trace event of (name, type, id) with the optional extra string.
   void Trace(const std::string& name,
              EventType type,
@@ skipping 29 matching lines @@
   scoped_ptr<base::ProcessMetrics> process_metrics_;
   RepeatingTimer<TraceLog> timer_;
 };
 
 }  // namespace debug
 }  // namespace base
 
 #endif  // defined(OS_WIN)
 
 #endif  // BASE_DEBUG_TRACE_EVENT_H_