Move Singleton and related structs to namespace base

base/trace_event/trace_event_synthetic_delay.cc

 // Copyright 2014 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/memory/singleton.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/trace_event/trace_event_synthetic_delay.h"
 
 namespace {
 const int kMaxSyntheticDelays = 32;
@@ skipping 11 matching lines @@
 
   TraceEventSyntheticDelay* GetOrCreateDelay(const char* name);
   void ResetAllDelays();
 
   // TraceEventSyntheticDelayClock implementation.
   base::TimeTicks Now() override;
 
  private:
   TraceEventSyntheticDelayRegistry();
 
-  friend struct DefaultSingletonTraits<TraceEventSyntheticDelayRegistry>;
+  friend struct base::DefaultSingletonTraits<TraceEventSyntheticDelayRegistry>;
 
   Lock lock_;
   TraceEventSyntheticDelay delays_[kMaxSyntheticDelays];
   TraceEventSyntheticDelay dummy_delay_;
   base::subtle::Atomic32 delay_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceEventSyntheticDelayRegistry);
 };
 
 TraceEventSyntheticDelay::TraceEventSyntheticDelay()
@@ skipping 99 matching lines @@
 
 void TraceEventSyntheticDelay::ApplyDelay(base::TimeTicks end_time) {
   TRACE_EVENT0("synthetic_delay", name_.c_str());
   while (clock_->Now() < end_time) {
     // Busy loop.
   }
 }
 
 TraceEventSyntheticDelayRegistry*
 TraceEventSyntheticDelayRegistry::GetInstance() {
-  return Singleton<
+  return base::Singleton<
       TraceEventSyntheticDelayRegistry,
-      LeakySingletonTraits<TraceEventSyntheticDelayRegistry> >::get();
+      base::LeakySingletonTraits<TraceEventSyntheticDelayRegistry> >::get();
 }
 
 TraceEventSyntheticDelayRegistry::TraceEventSyntheticDelayRegistry()
     : delay_count_(0) {}
 
 TraceEventSyntheticDelay* TraceEventSyntheticDelayRegistry::GetOrCreateDelay(
     const char* name) {
   // Try to find an existing delay first without locking to make the common case
   // fast.
   int delay_count = base::subtle::Acquire_Load(&delay_count_);
@@ skipping 61 matching lines @@
     delay_impl =
         base::trace_event::TraceEventSyntheticDelayRegistry::GetInstance()
             ->GetOrCreateDelay(name);
     base::subtle::Release_Store(
         impl_ptr, reinterpret_cast<base::subtle::AtomicWord>(delay_impl));
   }
   return delay_impl;
 }
 
 }  // namespace trace_event_internal