diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-13 23:44:20 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-13 23:44:20 +0000 |
| commit | 2902738f2a36d4f0ef22e25369e653f4eda2a7aa (patch) | |
| tree | 582ce3d66406a222edb686625227c1eea475d285 /net/base/ev_root_ca_metadata.h | |
| parent | 2d39894da98b2ae12b4052776c4fcf23d1bf2442 (diff) | |
| download | chromium_src-2902738f2a36d4f0ef22e25369e653f4eda2a7aa.zip chromium_src-2902738f2a36d4f0ef22e25369e653f4eda2a7aa.tar.gz chromium_src-2902738f2a36d4f0ef22e25369e653f4eda2a7aa.tar.bz2 | |
Revert 65996 (test breakage) - 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
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/4980001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ev_root_ca_metadata.h')
| -rw-r--r-- | net/base/ev_root_ca_metadata.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/base/ev_root_ca_metadata.h b/net/base/ev_root_ca_metadata.h index 832ebe2..e0961f3 100644 --- a/net/base/ev_root_ca_metadata.h +++ b/net/base/ev_root_ca_metadata.h @@ -17,10 +17,8 @@ #include "net/base/x509_certificate.h" -namespace base { template <typename T> -struct DefaultLazyInstanceTraits; -} // namespace base +struct DefaultSingletonTraits; namespace net { @@ -57,7 +55,7 @@ class EVRootCAMetadata { PolicyOID policy_oid) const; private: - friend struct base::DefaultLazyInstanceTraits<EVRootCAMetadata>; + friend struct DefaultSingletonTraits<EVRootCAMetadata>; typedef std::map<SHA1Fingerprint, PolicyOID, SHA1FingerprintLessThan> PolicyOidMap; |