| Index: net/cert/nss_cert_database.h
|
| diff --git a/net/cert/nss_cert_database.h b/net/cert/nss_cert_database.h
|
| index df52e589f3f70d1cd1e2a747286e240ff2ca0add..ce1a7e9d716c55f09333ae4fd2b88efb6812dd22 100644
|
| --- a/net/cert/nss_cert_database.h
|
| +++ b/net/cert/nss_cert_database.h
|
| @@ -18,10 +18,12 @@
|
| #include "net/cert/x509_certificate.h"
|
|
|
| namespace base {
|
| -template <typename T> struct DefaultLazyInstanceTraits;
|
| +template <typename T>
|
| +struct DefaultLazyInstanceTraits;
|
| class TaskRunner;
|
| }
|
| -template <class ObserverType> class ObserverListThreadSafe;
|
| +template <class ObserverType>
|
| +class ObserverListThreadSafe;
|
|
|
| namespace net {
|
|
|
| @@ -31,7 +33,6 @@ typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
|
| // Provides functions to manipulate the NSS certificate stores.
|
| class NET_EXPORT NSSCertDatabase {
|
| public:
|
| -
|
| class NET_EXPORT Observer {
|
| public:
|
| virtual ~Observer() {}
|
| @@ -84,13 +85,13 @@ class NET_EXPORT NSSCertDatabase {
|
| // consts due to compilation/linkage constraints with template functions.
|
| typedef uint32 TrustBits;
|
| enum {
|
| - TRUST_DEFAULT = 0,
|
| - TRUSTED_SSL = 1 << 0,
|
| - TRUSTED_EMAIL = 1 << 1,
|
| - TRUSTED_OBJ_SIGN = 1 << 2,
|
| - DISTRUSTED_SSL = 1 << 3,
|
| - DISTRUSTED_EMAIL = 1 << 4,
|
| - DISTRUSTED_OBJ_SIGN = 1 << 5,
|
| + TRUST_DEFAULT = 0,
|
| + TRUSTED_SSL = 1 << 0,
|
| + TRUSTED_EMAIL = 1 << 1,
|
| + TRUSTED_OBJ_SIGN = 1 << 2,
|
| + DISTRUSTED_SSL = 1 << 3,
|
| + DISTRUSTED_EMAIL = 1 << 4,
|
| + DISTRUSTED_OBJ_SIGN = 1 << 5,
|
| };
|
|
|
| typedef base::Callback<void(scoped_ptr<CertificateList> certs)>
|
|
|