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

Unified Diff: net/cert/x509_certificate_openssl.cc

Issue 1308823002: Move Singleton and related structs to namespace base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ToT Created 5 years, 3 months 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
« no previous file with comments | « net/cert/cert_database.cc ('k') | net/ftp/ftp_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/x509_certificate_openssl.cc
diff --git a/net/cert/x509_certificate_openssl.cc b/net/cert/x509_certificate_openssl.cc
index 0d92a83e91c07bc2938bf7aba89e74536fac24e5..6e803619db7816053aba786e54d55f415db2cc31 100644
--- a/net/cert/x509_certificate_openssl.cc
+++ b/net/cert/x509_certificate_openssl.cc
@@ -142,8 +142,8 @@ class X509InitSingleton {
// We allow the X509 store to leak, because it is used from a non-joinable
// worker that is not stopped on shutdown, hence may still be using
// OpenSSL library after the AtExit runner has completed.
- return Singleton<X509InitSingleton,
- LeakySingletonTraits<X509InitSingleton> >::get();
+ return base::Singleton<X509InitSingleton, base::LeakySingletonTraits<
+ X509InitSingleton>>::get();
}
X509_STORE* store() const { return store_.get(); }
@@ -155,7 +155,7 @@ class X509InitSingleton {
}
private:
- friend struct DefaultSingletonTraits<X509InitSingleton>;
+ friend struct base::DefaultSingletonTraits<X509InitSingleton>;
X509InitSingleton() {
crypto::EnsureOpenSSLInit();
ResetCertStore();
« no previous file with comments | « net/cert/cert_database.cc ('k') | net/ftp/ftp_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698