Access singletons with a new GetInstance() method instead of Singleton<T>.

base/crypto/cssm_init.cc

 // Copyright (c) 2009 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/crypto/cssm_init.h"
 
 #include <Security/SecBase.h>
 
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/singleton.h"
 #include "base/sys_string_conversions.h"
 
 // When writing crypto code for Mac OS X, you may find the following
 // documentation useful:
 // - Common Security: CDSA and CSSM, Version 2 (with corrigenda)
 //   http://www.opengroup.org/security/cdsa.htm
 // - Apple Cryptographic Service Provider Functional Specification
 // - CryptoSample: http://developer.apple.com/SampleCode/CryptoSample/
 
 namespace {
 
 class CSSMInitSingleton {
  public:
+  static CSSMInitSingleton* GetInstance() {
+    return Singleton<CSSMInitSingleton>::get();
+  }
+
+  CSSM_CSP_HANDLE csp_handle() const  {return csp_handle_;}
+
+ private:
   CSSMInitSingleton() : inited_(false), loaded_(false), csp_handle_(NULL) {
     static CSSM_VERSION version = {2, 0};
     // TODO(wtc): what should our caller GUID be?
     static const CSSM_GUID test_guid = {
       0xFADE, 0, 0, { 1, 2, 3, 4, 5, 6, 7, 0 }
     };
     CSSM_RETURN crtn;
     CSSM_PVC_MODE pvc_policy = CSSM_PVC_NONE;
     crtn = CSSM_Init(&version, CSSM_PRIVILEGE_SCOPE_NONE, &test_guid,
                      CSSM_KEY_HIERARCHY_NONE, &pvc_policy, NULL);
@@ skipping 26 matching lines @@
     if (loaded_) {
       crtn = CSSM_ModuleUnload(&gGuidAppleCSP, NULL, NULL);
       DCHECK(crtn == CSSM_OK);
     }
     if (inited_) {
       crtn = CSSM_Terminate();
       DCHECK(crtn == CSSM_OK);
     }
   }
 
-  CSSM_CSP_HANDLE csp_handle() const  {return csp_handle_;}
-
- private:
   bool inited_;  // True if CSSM_Init has been called successfully.
   bool loaded_;  // True if CSSM_ModuleLoad has been called successfully.
   CSSM_CSP_HANDLE csp_handle_;
+
+  friend struct DefaultSingletonTraits<CSSMInitSingleton>;
 };
 
 // This singleton is separate as it pertains to Apple's wrappers over
 // their own CSSM handles, as opposed to our own CSSM_CSP_HANDLE.
 class SecurityServicesSingleton {
  public:
+  static SecurityServicesSingleton* GetInstance() {
+    return Singleton<SecurityServicesSingleton>::get();
+  }
+
   ~SecurityServicesSingleton() {}
 
   Lock& lock() { return lock_; }
 
  private:
   friend class Singleton<SecurityServicesSingleton>;
   friend struct DefaultSingletonTraits<SecurityServicesSingleton>;
 
   SecurityServicesSingleton() {}
 
   Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(SecurityServicesSingleton);
 };
 
 }  // namespace
 
 namespace base {
 
 void EnsureCSSMInit() {
-  Singleton<CSSMInitSingleton>::get();
+  CSSMInitSingleton::GetInstance();
 }
 
 CSSM_CSP_HANDLE GetSharedCSPHandle() {
-  return Singleton<CSSMInitSingleton>::get()->csp_handle();
+  return CSSMInitSingleton::GetInstance()->csp_handle();
 }
 
 void* CSSMMalloc(CSSM_SIZE size, void *alloc_ref) {
   return malloc(size);
 }
 
 void CSSMFree(void* mem_ptr, void* alloc_ref) {
   free(mem_ptr);
 }
 
@@ skipping 20 matching lines @@
   if (cfstr) {
     std::string err_name = SysCFStringRefToUTF8(cfstr);
     CFRelease(cfstr);
     LOG(ERROR) << fn_name << " returned " << err << " (" << err_name << ")";
   } else {
     LOG(ERROR) << fn_name << " returned " << err;
   }
 }
 
 Lock& GetMacSecurityServicesLock() {
-  return Singleton<SecurityServicesSingleton>::get()->lock();
+  return SecurityServicesSingleton::GetInstance()->lock();
 }
 
 }  // namespace base