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

net/socket/ssl_client_socket_mac.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_mac.h"
 
 #include <CoreServices/CoreServices.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
 #include <algorithm>
 
+#include "base/lazy_instance.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/singleton.h"
 #include "base/string_util.h"
 #include "net/base/address_list.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_cert_request_info.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/ssl_info.h"
 #include "net/socket/client_socket_handle.h"
@@ skipping 442 matching lines @@
   const std::vector<uint16>& disabled_cipher_suites_;
 };
 
 // Class to determine what cipher suites are available and which cipher
 // suites should be enabled, based on the overall security policy.
 class EnabledCipherSuites {
  public:
   const std::vector<SSLCipherSuite>& ciphers() const { return ciphers_; }
 
  private:
-  friend struct DefaultSingletonTraits<EnabledCipherSuites>;
+  friend struct base::DefaultLazyInstanceTraits<EnabledCipherSuites>;
   EnabledCipherSuites();
   ~EnabledCipherSuites() {}
 
   std::vector<SSLCipherSuite> ciphers_;
 
   DISALLOW_COPY_AND_ASSIGN(EnabledCipherSuites);
 };
 
+static base::LazyInstance<EnabledCipherSuites> g_enabled_cipher_suites(
+    base::LINKER_INITIALIZED);
+
 EnabledCipherSuites::EnabledCipherSuites() {
   SSLContextRef ssl_context;
   OSStatus status = SSLNewContext(false, &ssl_context);
   if (status != noErr)
     return;
 
   size_t num_supported_ciphers;
   status = SSLGetNumberSupportedCiphers(ssl_context, &num_supported_ciphers);
   if (status != noErr) {
     SSLDisposeContext(ssl_context);
@@ skipping 282 matching lines @@
   if (status)
     return NetErrorFromOSStatus(status);
 
   status = SSLSetProtocolVersionEnabled(ssl_context_,
                                         kTLSProtocol1,
                                         ssl_config_.tls1_enabled);
   if (status)
     return NetErrorFromOSStatus(status);
 
   std::vector<SSLCipherSuite> enabled_ciphers =
-      Singleton<EnabledCipherSuites>::get()->ciphers();
+      g_enabled_cipher_suites.Get().ciphers();
 
   CipherSuiteIsDisabledFunctor is_disabled_cipher(
       ssl_config_.disabled_cipher_suites);
   std::vector<SSLCipherSuite>::iterator new_end =
       std::remove_if(enabled_ciphers.begin(), enabled_ciphers.end(),
                      is_disabled_cipher);
   if (new_end != enabled_ciphers.end())
     enabled_ciphers.erase(new_end, enabled_ciphers.end());
 
   status = SSLSetEnabledCiphers(
@@ skipping 519 matching lines @@
   if (rv < 0 && rv != ERR_IO_PENDING) {
     us->write_io_buf_ = NULL;
     return OSStatusFromNetError(rv);
   }
 
   // always lie to our caller
   return noErr;
 }
 
 }  // namespace net