summaryrefslogtreecommitdiffstats
path: root/net/base/x509_certificate.h
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 20:34:18 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-19 20:34:18 +0000
commit359d2bf31d2edc43a9ca8b08ee07707038efce09 (patch)
tree10bf00aa3964c73a37bae063a349bd496010ed4b /net/base/x509_certificate.h
parent1da05ebbe6301142de46ef7cb100b6cc5aaa38c2 (diff)
downloadchromium_src-359d2bf31d2edc43a9ca8b08ee07707038efce09.zip
chromium_src-359d2bf31d2edc43a9ca8b08ee07707038efce09.tar.gz
chromium_src-359d2bf31d2edc43a9ca8b08ee07707038efce09.tar.bz2
Reland 66791 (change was innocent)
Revert 66719 - Reland r65996. Disallows Singletons on non-joinable thread. Test breakages caused by this change have been fixed here or in other changelists. BUG=61753 TEST=none Review URL: http://codereview.chromium.org/5024003 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/5206005 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/5242002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/x509_certificate.h')
-rw-r--r--net/base/x509_certificate.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h
index 1866a17..9f44952 100644
--- a/net/base/x509_certificate.h
+++ b/net/base/x509_certificate.h
@@ -284,8 +284,6 @@ class X509Certificate : public base::RefCountedThreadSafe<X509Certificate> {
FRIEND_TEST_ALL_PREFIXES(X509CertificateTest, Cache);
FRIEND_TEST_ALL_PREFIXES(X509CertificateTest, IntermediateCertificates);
- class Cache;
-
// Construct an X509Certificate from a handle to the certificate object
// in the underlying crypto library.
X509Certificate(OSCertHandle cert_handle, Source source,