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

base/debug/trace_event.h

Index: base/debug/trace_event.h
diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h
index 49ba4bd77623639ff89839e62abdf41a58d44f07..160bbc86f4152bd8c24e961d3f5a3809dfe6e32b 100644
--- a/base/debug/trace_event.h
+++ b/base/debug/trace_event.h
@@ -52,7 +52,7 @@
 // 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), \
@@ -63,7 +63,7 @@
 // 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), \
@@ -73,7 +73,7 @@
 
 // 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), \
@@ -96,6 +96,8 @@ class TraceLog {
     EVENT_INSTANT
   };
 
+  static TraceLog* GetInstance();
+
   // Is tracing currently enabled.
   static bool IsTracing();
   // Start logging trace events.