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

base/debug/trace_event_win.cc

 // 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.
 
 #include "base/debug/trace_event_win.h"
 
 #include "base/logging.h"
 #include "base/singleton.h"
 #include <initguid.h>  // NOLINT
 
@@ skipping 13 matching lines @@
 
 // {97BE602D-2930-4ac3-8046-B6763B631DFE}
 const GUID kTraceEventClass64 = {
     0x97be602d, 0x2930, 0x4ac3, 0x80, 0x46, 0xb6, 0x76, 0x3b, 0x63, 0x1d, 0xfe};
 
 
 TraceLog::TraceLog() : EtwTraceProvider(kChromeTraceProviderName) {
   Register();
 }
 
-TraceLog* TraceLog::Get() {
-  return Singleton<TraceLog, StaticMemorySingletonTraits<TraceLog>>::get();
+TraceLog* TraceLog::GetInstance() {
+  return Singleton<TraceLog, StaticMemorySingletonTraits<TraceLog> >::get();
 }
 
 bool TraceLog::StartTracing() {
   return true;
 }
 
 void TraceLog::TraceEvent(const char* name,
                           size_t name_len,
                           EventType type,
                           const void* id,
@@ skipping 46 matching lines @@
   // Trace the event.
   Log(event.get());
 }
 
 void TraceLog::Trace(const char* name,
                      size_t name_len,
                      EventType type,
                      const void* id,
                      const char* extra,
                      size_t extra_len) {
-  TraceLog* provider = TraceLog::Get();
+  TraceLog* provider = TraceLog::GetInstance();
   if (provider && provider->IsTracing()) {
     // Compute the name & extra lengths if not supplied already.
     if (name_len == -1)
       name_len = (name == NULL) ? 0 : strlen(name);
     if (extra_len == -1)
       extra_len = (extra == NULL) ? 0 : strlen(extra);
 
     provider->TraceEvent(name, name_len, type, id, extra, extra_len);
   }
 }
 
 void TraceLog::Resurrect() {
   StaticMemorySingletonTraits<TraceLog>::Resurrect();
 }
 
 }  // namespace debug
 }  // namespace base