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

base/debug/trace_event.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.h"
 
 #include "base/format_macros.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 27 matching lines @@
   process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(proc,
                                                                     NULL));
 #endif
 }
 
 TraceLog::~TraceLog() {
   Stop();
 }
 
 // static
+TraceLog* TraceLog::GetInstance() {
+  return Singleton<TraceLog, DefaultSingletonTraits<TraceLog> >::get();
+}
+
+// static
 bool TraceLog::IsTracing() {
-  TraceLog* trace = Singleton<TraceLog>::get();
-  return trace->enabled_;
+  return TraceLog::GetInstance()->enabled_;
 }
 
 // static
 bool TraceLog::StartTracing() {
-  TraceLog* trace = Singleton<TraceLog>::get();
-  return trace->Start();
+  return TraceLog::GetInstance()->Start();
 }
 
 bool TraceLog::Start() {
   if (enabled_)
     return true;
   enabled_ = OpenLogFile();
   if (enabled_) {
     Log("var raw_trace_events = [\n");
     trace_start_time_ = TimeTicks::Now();
     timer_.Start(TimeDelta::FromMilliseconds(250), this, &TraceLog::Heartbeat);
   }
   return enabled_;
 }
 
 // static
 void TraceLog::StopTracing() {
-  TraceLog* trace = Singleton<TraceLog>::get();
-  return trace->Stop();
+  return TraceLog::GetInstance()->Stop();
 }
 
 void TraceLog::Stop() {
   if (enabled_) {
     enabled_ = false;
     Log("];\n");
     CloseLogFile();
     timer_.Stop();
   }
 }
@@ skipping 72 matching lines @@
 }
 
 void TraceLog::Log(const std::string& msg) {
   AutoLock lock(file_lock_);
 
   fprintf(log_file_, "%s", msg.c_str());
 }
 
 }  // namespace debug
 }  // namespace base