Move Singleton and related structs to namespace base

content/browser/tracing/power_tracing_agent.cc

 // Copyright 2015 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/lazy_instance.h"
 #include "base/memory/singleton.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "content/browser/tracing/battor_power_trace_provider.h"
 #include "content/browser/tracing/power_tracing_agent.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 35 matching lines @@
 void PowerTracingAgent::OnStopTracingDone(
     const OutputCallback& callback,
     const scoped_refptr<base::RefCountedString>& result) {
   is_tracing_ = false;
   // Pass the serialized events.
   callback.Run(result);
 }
 
 // static
 PowerTracingAgent* PowerTracingAgent::GetInstance() {
-  return Singleton<PowerTracingAgent>::get();
+  return base::Singleton<PowerTracingAgent>::get();
 }
 
 void PowerTracingAgent::FlushOnThread(const OutputCallback& callback) {
   // Pass the result to the UI Thread.
 
   // TODO(prabhur) StopTracing & GetLog need to be called on a
   // separate thread depending on how BattorPowerTraceProvider is implemented.
   battor_trace_provider_->StopTracing();
   std::string battor_logs;
   battor_trace_provider_->GetLog(&battor_logs);
   scoped_refptr<base::RefCountedString> result =
       base::RefCountedString::TakeString(&battor_logs);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, result));
 }
 
 }  // namespace content