Move Singleton and related structs to namespace base

crypto/capi_util.cc

Index: crypto/capi_util.cc
diff --git a/crypto/capi_util.cc b/crypto/capi_util.cc
index 2cf10625ec34fc09f66a0b8964c478e9cd50e5ea..1a3e139b50e0bd309efcb7d4f2f18d2d0c21f3d4 100644
--- a/crypto/capi_util.cc
+++ b/crypto/capi_util.cc
@@ -13,7 +13,7 @@ namespace {
 class CAPIUtilSingleton {
  public:
   static CAPIUtilSingleton* GetInstance() {
-    return Singleton<CAPIUtilSingleton>::get();
+    return base::Singleton<CAPIUtilSingleton>::get();
   }
 
   // Returns a lock to guard calls to CryptAcquireContext with
@@ -23,8 +23,8 @@ class CAPIUtilSingleton {
   }
 
  private:
-  friend class Singleton<CAPIUtilSingleton>;
-  friend struct DefaultSingletonTraits<CAPIUtilSingleton>;
+  friend class base::Singleton<CAPIUtilSingleton>;
+  friend struct base::DefaultSingletonTraits<CAPIUtilSingleton>;
 
   CAPIUtilSingleton() {}