Move Singleton and related structs to namespace base

chrome/test/base/tracing.cc

 // Copyright (c) 2012 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 "chrome/test/base/tracing.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 28 matching lines @@
 
   std::string* result_;
   base::Closure completion_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(StringTraceSink);
 };
 
 class InProcessTraceController {
  public:
   static InProcessTraceController* GetInstance() {
-    return Singleton<InProcessTraceController>::get();
+    return base::Singleton<InProcessTraceController>::get();
   }
 
   InProcessTraceController()
       : is_waiting_on_watch_(false),
         watch_notification_count_(0) {}
   virtual ~InProcessTraceController() {}
 
   bool BeginTracing(const std::string& category_patterns) {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     return content::TracingController::GetInstance()->EnableRecording(
@@ skipping 59 matching lines @@
     message_loop_runner_ = new content::MessageLoopRunner;
     message_loop_runner_->Run();
 
     // Watch notifications can occur during this method's message loop run, but
     // not after, so clear them here.
     watch_notification_count_ = 0;
     return true;
   }
 
  private:
-  friend struct DefaultSingletonTraits<InProcessTraceController>;
+  friend struct base::DefaultSingletonTraits<InProcessTraceController>;
 
   void OnEnableTracingComplete() {
     message_loop_runner_->Quit();
   }
 
   void OnTracingComplete() { message_loop_runner_->Quit(); }
 
   void OnWatchEventMatched() {
     if (watch_notification_count_ == 0)
       return;
@@ skipping 39 matching lines @@
 bool WaitForWatchEvent(base::TimeDelta timeout) {
   return InProcessTraceController::GetInstance()->WaitForWatchEvent(timeout);
 }
 
 bool EndTracing(std::string* json_trace_output) {
   return InProcessTraceController::GetInstance()->EndTracing(json_trace_output);
 }
 
 }  // namespace tracing