Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2098)

Unified Diff: net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp

Issue 5682008: Make members of Singleton<T> private and only visible to the singleton type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp
diff --git a/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp b/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp
index aae8d90c0067950c70b0479af5cf94a6e168ad6b..cf2b0cfa7a4bca0b00182cb411334b8ecda10e14 100644
--- a/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp
+++ b/net/third_party/mozilla_security_manager/nsPKCS12Blob.cpp
@@ -43,9 +43,9 @@
#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"
@@ -252,10 +252,13 @@ class PKCS12InitSingleton {
}
};
+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.

Powered by Google App Engine
This is Rietveld 408576698