Make members of Singleton<T> private and only visible to the singleton type.

net/socket/ssl_client_socket_win.cc

 // Copyright (c) 2010 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 "net/socket/ssl_client_socket_win.h"
 
 #include <schnlsp.h>
 #include <map>
 
 #include "base/compiler_specific.h"
+#include "base/lazy_instance.h"
 #include "base/lock.h"
-#include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_log.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_cert_request_info.h"
@@ skipping 164 matching lines @@
   Lock lock_;
 
   // Anonymous (no client certificate) CredHandles for all possible
   // combinations of SSL versions.  Defined as an array for fast lookup.
   CredHandleClass anonymous_creds_[SSL_VERSION_MASKS];
 
   // CredHandles that use a client certificate.
   CredHandleMap client_cert_creds_;
 };
 
+static base::LazyInstance<CredHandleTable> g_cred_handle_table(
+    base::LINKER_INITIALIZED);
+
 // static
 int CredHandleTable::InitializeHandle(CredHandle* handle,
                                       PCCERT_CONTEXT client_cert,
                                       int ssl_version_mask) {
   SCHANNEL_CRED schannel_cred = {0};
   schannel_cred.dwVersion = SCHANNEL_CRED_VERSION;
   if (client_cert) {
     schannel_cred.cCreds = 1;
     schannel_cred.paCred = &client_cert;
     // Schannel will make its own copy of client_cert.
@@ skipping 71 matching lines @@
 // TLS-intolerant servers).  These CredHandles are initialized only when
 // needed.
 
 static int GetCredHandle(PCCERT_CONTEXT client_cert,
                          int ssl_version_mask,
                          CredHandle** handle_ptr) {
   if (ssl_version_mask <= 0 || ssl_version_mask >= SSL_VERSION_MASKS) {
     NOTREACHED();
     return ERR_UNEXPECTED;
   }
-  return Singleton<CredHandleTable>::get()->GetHandle(client_cert,
-                                                      ssl_version_mask,
-                                                      handle_ptr);
+  return g_cred_handle_table.Get().GetHandle(client_cert,
+                                             ssl_version_mask,
+                                             handle_ptr);
 }
 
 //-----------------------------------------------------------------------------
 
 // This callback is intended to be used with CertFindChainInStore. In addition
 // to filtering by extended/enhanced key usage, we do not show expired
 // certificates and require digital signature usage in the key usage
 // extension.
 //
 // This matches our behavior on Mac OS X and that of NSS. It also matches the
@@ skipping 48 matching lines @@
                                                CERT_STORE_ADD_USE_EXISTING,
                                                &copy);
     DCHECK(ok);
     return ok ? copy : NULL;
   }
 
  private:
   HCERTSTORE store_;
 };
 
+static base::LazyInstance<ClientCertStore> g_client_cert_store(
+    base::LINKER_INITIALIZED);
+
 //-----------------------------------------------------------------------------
 
 // Size of recv_buffer_
 //
 // Ciphertext is decrypted one SSL record at a time, so recv_buffer_ needs to
 // have room for a full SSL record, with the header and trailer.  Here is the
 // breakdown of the size:
 //   5: SSL record header
 //   16K: SSL record maximum size
 //   64: >= SSL record trailer (16 or 20 have been observed)
@@ skipping 131 matching lines @@
         DLOG(ERROR) << "CertFindChainInStore failed: " << err;
       break;
     }
 
     // Get the leaf certificate.
     PCCERT_CONTEXT cert_context =
         chain_context->rgpChain[0]->rgpElement[0]->pCertContext;
     // Copy it to our own certificate store, so that we can close the "MY"
     // certificate store before returning from this function.
     PCCERT_CONTEXT cert_context2 =
-        Singleton<ClientCertStore>::get()->CopyCertContext(cert_context);
+        g_client_cert_store.Get().CopyCertContext(cert_context);
     if (!cert_context2) {
       NOTREACHED();
       continue;
     }
     scoped_refptr<X509Certificate> cert = X509Certificate::CreateFromHandle(
         cert_context2, X509Certificate::SOURCE_LONE_CERT_IMPORT,
         X509Certificate::OSCertHandles());
     cert_request_info->client_certs.push_back(cert);
     CertFreeCertificateContext(cert_context2);
   }
@@ skipping 984 matching lines @@
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA);
 }
 
 void SSLClientSocketWin::FreeSendBuffer() {
   SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer);
   DCHECK(status == SEC_E_OK);
   memset(&send_buffer_, 0, sizeof(send_buffer_));
 }
 
 }  // namespace net