Reland r65996. Disallows Singletons on non-joinable thread.

net/base/ev_root_ca_metadata.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/base/ev_root_ca_metadata.h"
 
 #if defined(USE_NSS)
 #include <cert.h>
 #include <pkcs11n.h>
 #include <secerr.h>
 #include <secoid.h>
 #elif defined(OS_WIN)
 #include <stdlib.h>
 #endif
 
+#include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/singleton.h"
 
 namespace net {
 
 // Raw metadata.
 struct EVMetadata {
   // The SHA-1 fingerprint of the root CA certificate, used as a unique
   // identifier for a root CA certificate.
   SHA1Fingerprint fingerprint;
 
   // The EV policy OID of the root CA.
@@ skipping 248 matching lines @@
   "2.16.840.1.113733.1.7.48.1",
   "2.16.840.1.114028.10.1.2",
   "2.16.840.1.114171.500.9",
   "2.16.840.1.114404.1.1.2.4.1",
   "2.16.840.1.114412.2.1",
   "2.16.840.1.114413.1.7.23.3",
   "2.16.840.1.114414.1.7.23.3",
 };
 #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(
     const SHA1Fingerprint& fingerprint,
     PolicyOID* policy_oid) const {
   PolicyOidMap::const_iterator iter = ev_policy_.find(fingerprint);
   if (iter == ev_policy_.end())
     return false;
   *policy_oid = iter->second;
   return true;
@@ skipping 85 matching lines @@
 // static
 bool EVRootCAMetadata::PolicyOIDsAreEqual(PolicyOID a, PolicyOID b) {
 #if defined(USE_NSS)
   return a == b;
 #else
   return !strcmp(a, b);
 #endif
 }
 
 }  // namespace net