summaryrefslogtreecommitdiffstats
path: root/net/base/ev_root_ca_metadata.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 21:25:38 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 21:25:38 +0000
commit82e8e2b5b879cd414e48e6418fb1a693093866e2 (patch)
tree513b4c2186f8be29e2d8a7d56e76a75d96dbf437 /net/base/ev_root_ca_metadata.h
parent48a5faa6500b6c6055348abf1540cbb06c721f33 (diff)
downloadchromium_src-82e8e2b5b879cd414e48e6418fb1a693093866e2.zip
chromium_src-82e8e2b5b879cd414e48e6418fb1a693093866e2.tar.gz
chromium_src-82e8e2b5b879cd414e48e6418fb1a693093866e2.tar.bz2
Disallow Singleton and LazyInstance on non-joinable threads.
Fix all known instances or explicitly allow them. Usually the fix involves switching from Default traits to Lazy traits. BUG=61753 TEST=none Review URL: http://codereview.chromium.org/4635012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ev_root_ca_metadata.h')
-rw-r--r--net/base/ev_root_ca_metadata.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/base/ev_root_ca_metadata.h b/net/base/ev_root_ca_metadata.h
index e0961f3..832ebe2 100644
--- a/net/base/ev_root_ca_metadata.h
+++ b/net/base/ev_root_ca_metadata.h
@@ -17,8 +17,10 @@
#include "net/base/x509_certificate.h"
+namespace base {
template <typename T>
-struct DefaultSingletonTraits;
+struct DefaultLazyInstanceTraits;
+} // namespace base
namespace net {
@@ -55,7 +57,7 @@ class EVRootCAMetadata {
PolicyOID policy_oid) const;
private:
- friend struct DefaultSingletonTraits<EVRootCAMetadata>;
+ friend struct base::DefaultLazyInstanceTraits<EVRootCAMetadata>;
typedef std::map<SHA1Fingerprint, PolicyOID,
SHA1FingerprintLessThan> PolicyOidMap;