Allow CDSA/CSSM to be used on worker threads in debug builds

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/logging.h"
 #include "base/singleton.h"
 #include "base/synchronization/lock.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();
+    return Singleton<CSSMInitSingleton,
+                     LeakySingletonTraits<CSSMInitSingleton> >::get();
   }
 
-  CSSM_CSP_HANDLE csp_handle() const  {return csp_handle_;}
+  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;
@@ skipping 40 matching lines @@
   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();
+    return Singleton<SecurityServicesSingleton,
+                     LeakySingletonTraits<SecurityServicesSingleton> >::get();
   }
 
-  ~SecurityServicesSingleton() {}
-
   base::Lock& lock() { return lock_; }
 
  private:
-  friend class Singleton<SecurityServicesSingleton>;
   friend struct DefaultSingletonTraits<SecurityServicesSingleton>;
 
   SecurityServicesSingleton() {}
+  ~SecurityServicesSingleton() {}
 
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(SecurityServicesSingleton);
 };
 
 }  // namespace
 
 namespace base {
 
@@ skipping 40 matching lines @@
   } else {
     LOG(ERROR) << fn_name << " returned " << err;
   }
 }
 
 base::Lock& GetMacSecurityServicesLock() {
   return SecurityServicesSingleton::GetInstance()->lock();
 }
 
 }  // namespace base