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

Unified Diff: net/base/ev_root_ca_metadata.cc

Issue 5024003: Reland r65996. Disallows Singletons on non-joinable thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Allow another use that should be fixed. Created 10 years, 1 month 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/base/ev_root_ca_metadata.h ('k') | net/base/keygen_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/ev_root_ca_metadata.cc
diff --git a/net/base/ev_root_ca_metadata.cc b/net/base/ev_root_ca_metadata.cc
index 661b652ca528ec0423f34dbd57c704f640438022..a721357042fe74e704387fc7af411fb13067b722 100644
--- a/net/base/ev_root_ca_metadata.cc
+++ b/net/base/ev_root_ca_metadata.cc
@@ -13,8 +13,8 @@
#include <stdlib.h>
#endif
+#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/singleton.h"
namespace net {
@@ -283,9 +283,13 @@ const EVRootCAMetadata::PolicyOID EVRootCAMetadata::policy_oids_[] = {
};
#endif
+static base::LazyInstance<EVRootCAMetadata,
+ base::LeakyLazyInstanceTraits<EVRootCAMetadata> >
+ g_ev_root_ca_metadata(base::LINKER_INITIALIZED);
+
// static
EVRootCAMetadata* EVRootCAMetadata::GetInstance() {
- return Singleton<EVRootCAMetadata>::get();
+ return g_ev_root_ca_metadata.Pointer();
}
bool EVRootCAMetadata::GetPolicyOID(
« no previous file with comments | « net/base/ev_root_ca_metadata.h ('k') | net/base/keygen_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698