Move Singleton and related structs to namespace base

crypto/cssm_init.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 "crypto/cssm_init.h"
 
 #include <Security/SecBase.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 21 matching lines @@
   return realloc(ptr, size);
 }
 
 void* CSSMCalloc(uint32 num, CSSM_SIZE size, void* alloc_ref) {
   return calloc(num, size);
 }
 
 class CSSMInitSingleton {
  public:
   static CSSMInitSingleton* GetInstance() {
-    return Singleton<CSSMInitSingleton,
-                     LeakySingletonTraits<CSSMInitSingleton> >::get();
+    return base::Singleton<CSSMInitSingleton, base::LeakySingletonTraits<
+                                                  CSSMInitSingleton>>::get();
   }
 
   CSSM_CSP_HANDLE csp_handle() const { return csp_handle_; }
   CSSM_CL_HANDLE cl_handle() const { return cl_handle_; }
   CSSM_TP_HANDLE tp_handle() const { return tp_handle_; }
 
  private:
   CSSMInitSingleton()
       : inited_(false), csp_loaded_(false), cl_loaded_(false),
         tp_loaded_(false), csp_handle_(CSSM_INVALID_HANDLE),
@@ skipping 89 matching lines @@
   }
 
   bool inited_;  // True if CSSM_Init has been called successfully.
   bool csp_loaded_;  // True if gGuidAppleCSP has been loaded
   bool cl_loaded_;  // True if gGuidAppleX509CL has been loaded.
   bool tp_loaded_;  // True if gGuidAppleX509TP has been loaded.
   CSSM_CSP_HANDLE csp_handle_;
   CSSM_CL_HANDLE cl_handle_;
   CSSM_TP_HANDLE tp_handle_;
 
-  friend struct DefaultSingletonTraits<CSSMInitSingleton>;
+  friend struct base::DefaultSingletonTraits<CSSMInitSingleton>;
 };
 
 }  // namespace
 
 namespace crypto {
 
 void EnsureCSSMInit() {
   CSSMInitSingleton::GetInstance();
 }
 
@@ skipping 31 matching lines @@
 }
 
 ScopedCSSMData::~ScopedCSSMData() {
   if (data_.Data) {
     CSSMFree(data_.Data);
     data_.Data = NULL;
   }
 }
 
 }  // namespace crypto