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

net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 25 matching lines @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "net/third_party/mozilla_security_manager/nsPKCS12Blob.h"
 
 #include <pk11pub.h>
 #include <pkcs12.h>
 #include <p12plcy.h>
 #include <secerr.h>
 
 #include "base/crypto/scoped_nss_types.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/nss_util_internal.h"
-#include "base/singleton.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/x509_certificate.h"
 
 namespace mozilla_security_manager {
 
 namespace {
 
 // unicodeToItem
 //
@@ skipping 186 matching lines @@
     SEC_PKCS12EnableCipher(PKCS12_DES_EDE3_168, 1);
     SEC_PKCS12SetPreferredCipher(PKCS12_DES_EDE3_168, 1);
 
     // Set no-op ascii-ucs2 conversion function to work around weird NSS
     // interface.  Thankfully, PKCS12 appears to be the only thing in NSS that
     // uses PORT_UCS2_ASCIIConversion, so this doesn't break anything else.
     PORT_SetUCS2_ASCIIConversionFunction(pip_ucs2_ascii_conversion_fn);
   }
 };
 
+static base::LazyInstance<PKCS12InitSingleton> g_pkcs12_init_singleton(
+    base::LINKER_INITIALIZED);
+
 }  // namespace
 
 void EnsurePKCS12Init() {
-  Singleton<PKCS12InitSingleton>::get();
+  g_pkcs12_init_singleton.Get();
 }
 
 // Based on nsPKCS12Blob::ImportFromFile.
 int nsPKCS12Blob_Import(const char* pkcs12_data,
                         size_t pkcs12_len,
                         const string16& password) {
   base::ScopedPK11Slot slot(base::GetDefaultNSSKeySlot());
   if (!slot.get()) {
     LOG(ERROR) << "Couldn't get Internal key slot!";
     return net::ERR_PKCS12_IMPORT_FAILED;
@@ skipping 119 matching lines @@
 finish:
   if (srv)
     LOG(ERROR) << "PKCS#12 export failed with error " << PORT_GetError();
   if (ecx)
     SEC_PKCS12DestroyExportContext(ecx);
   SECITEM_ZfreeItem(&unicodePw, PR_FALSE);
   return return_count;
 }
 
 }  // namespace mozilla_security_manager