| Index: net/cert/test_root_certs_nss.cc
|
| diff --git a/net/cert/test_root_certs_nss.cc b/net/cert/test_root_certs_nss.cc
|
| index 3c271452fafd0af62562b41393a4a761e45769e5..330f46e7ceca3af4f7457811adeddb55ef613976 100644
|
| --- a/net/cert/test_root_certs_nss.cc
|
| +++ b/net/cert/test_root_certs_nss.cc
|
| @@ -43,8 +43,7 @@ class TestRootCerts::TrustEntry {
|
|
|
| TestRootCerts::TrustEntry::TrustEntry(CERTCertificate* certificate,
|
| const CERTCertTrust& trust)
|
| - : certificate_(CERT_DupCertificate(certificate)),
|
| - trust_(trust) {
|
| + : certificate_(CERT_DupCertificate(certificate)), trust_(trust) {
|
| }
|
|
|
| TestRootCerts::TrustEntry::~TrustEntry() {
|
| @@ -97,11 +96,11 @@ void TestRootCerts::Clear() {
|
| // the first entry, while the first entry contains the desired resultant
|
| // status.
|
| for (std::list<TrustEntry*>::reverse_iterator it = trust_cache_.rbegin();
|
| - it != trust_cache_.rend(); ++it) {
|
| + it != trust_cache_.rend();
|
| + ++it) {
|
| CERTCertTrust original_trust = (*it)->trust();
|
| - SECStatus rv = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(),
|
| - (*it)->certificate(),
|
| - &original_trust);
|
| + SECStatus rv = CERT_ChangeCertTrust(
|
| + CERT_GetDefaultCertDB(), (*it)->certificate(), &original_trust);
|
| // DCHECK(), rather than LOG(), as a failure to restore the original
|
| // trust can cause flake or hard-to-trace errors in any unit tests that
|
| // occur after Clear() has been called.
|
| @@ -117,7 +116,8 @@ bool TestRootCerts::IsEmpty() const {
|
| #if defined(USE_NSS)
|
| bool TestRootCerts::Contains(CERTCertificate* cert) const {
|
| for (std::list<TrustEntry*>::const_iterator it = trust_cache_.begin();
|
| - it != trust_cache_.end(); ++it) {
|
| + it != trust_cache_.end();
|
| + ++it) {
|
| if (X509Certificate::IsSameOSCert(cert, (*it)->certificate()))
|
| return true;
|
| }
|
|
|