Move Singleton and related structs to namespace base

base/memory/singleton_unittest.cc

Index: base/memory/singleton_unittest.cc
diff --git a/base/memory/singleton_unittest.cc b/base/memory/singleton_unittest.cc
index dbff007ada7ecc27045acdff7082fb448024dab1..269e70825c11e520ffef8ae42c85a98a6350d8c4 100644
--- a/base/memory/singleton_unittest.cc
+++ b/base/memory/singleton_unittest.cc
@@ -8,14 +8,14 @@
 
 namespace {
 
-COMPILE_ASSERT(DefaultSingletonTraits<int>::kRegisterAtExit == true, a);
+COMPILE_ASSERT(base::DefaultSingletonTraits<int>::kRegisterAtExit == true, a);

[Mark Mentovai, 2015/08/31 14:00:51]

Putting these in base::<unnamed namespace> also would have been OK.

 
 typedef void (*CallbackFunc)();
 
 class IntSingleton {
  public:
   static IntSingleton* GetInstance() {
-    return Singleton<IntSingleton>::get();
+    return base::Singleton<IntSingleton>::get();
   }
 
   int value_;
@@ -26,13 +26,14 @@ class Init5Singleton {
   struct Trait;
 
   static Init5Singleton* GetInstance() {
-    return Singleton<Init5Singleton, Trait>::get();
+    return base::Singleton<Init5Singleton, Trait>::get();
   }
 
   int value_;
 };
 
-struct Init5Singleton::Trait : public DefaultSingletonTraits<Init5Singleton> {
+struct Init5Singleton::Trait
+    : public base::DefaultSingletonTraits<Init5Singleton> {
   static Init5Singleton* New() {
     Init5Singleton* instance = new Init5Singleton();
     instance->value_ = 5;
@@ -49,11 +50,11 @@ int* SingletonInt5() {
 }
 
 template <typename Type>
-struct CallbackTrait : public DefaultSingletonTraits<Type> {
+struct CallbackTrait : public base::DefaultSingletonTraits<Type> {
   static void Delete(Type* instance) {
     if (instance->callback_)
       (instance->callback_)();
-    DefaultSingletonTraits<Type>::Delete(instance);
+    base::DefaultSingletonTraits<Type>::Delete(instance);
   }
 };
 
@@ -70,7 +71,7 @@ class CallbackSingletonWithNoLeakTrait : public CallbackSingleton {
   CallbackSingletonWithNoLeakTrait() : CallbackSingleton() { }
 
   static CallbackSingletonWithNoLeakTrait* GetInstance() {
-    return Singleton<CallbackSingletonWithNoLeakTrait, Trait>::get();
+    return base::Singleton<CallbackSingletonWithNoLeakTrait, Trait>::get();
   }
 };
 
@@ -83,7 +84,7 @@ class CallbackSingletonWithLeakTrait : public CallbackSingleton {
   CallbackSingletonWithLeakTrait() : CallbackSingleton() { }
 
   static CallbackSingletonWithLeakTrait* GetInstance() {
-    return Singleton<CallbackSingletonWithLeakTrait, Trait>::get();
+    return base::Singleton<CallbackSingletonWithLeakTrait, Trait>::get();
   }
 };
 
@@ -94,16 +95,17 @@ class CallbackSingletonWithStaticTrait : public CallbackSingleton {
   CallbackSingletonWithStaticTrait() : CallbackSingleton() { }
 
   static CallbackSingletonWithStaticTrait* GetInstance() {
-    return Singleton<CallbackSingletonWithStaticTrait, Trait>::get();
+    return base::Singleton<CallbackSingletonWithStaticTrait, Trait>::get();
   }
 };
 
 struct CallbackSingletonWithStaticTrait::Trait
-    : public StaticMemorySingletonTraits<CallbackSingletonWithStaticTrait> {
+    : public base::StaticMemorySingletonTraits<
+          CallbackSingletonWithStaticTrait> {
   static void Delete(CallbackSingletonWithStaticTrait* instance) {
     if (instance->callback_)
       (instance->callback_)();
-    StaticMemorySingletonTraits<CallbackSingletonWithStaticTrait>::Delete(
+    base::StaticMemorySingletonTraits<CallbackSingletonWithStaticTrait>::Delete(
         instance);
   }
 };
@@ -114,8 +116,9 @@ class AlignedTestSingleton {
   AlignedTestSingleton() {}
   ~AlignedTestSingleton() {}
   static AlignedTestSingleton* GetInstance() {
-    return Singleton<AlignedTestSingleton,
-        StaticMemorySingletonTraits<AlignedTestSingleton> >::get();
+    return base::Singleton<
+        AlignedTestSingleton,
+        base::StaticMemorySingletonTraits<AlignedTestSingleton>>::get();
   }
 
   Type type_;
@@ -135,7 +138,7 @@ CallbackFunc* GetLeakySingleton() {
 }
 
 void DeleteLeakySingleton() {
-  DefaultSingletonTraits<CallbackSingletonWithLeakTrait>::Delete(
+  base::DefaultSingletonTraits<CallbackSingletonWithLeakTrait>::Delete(
       CallbackSingletonWithLeakTrait::GetInstance());
 }