Chromium Code Reviews| Index: net/base/cert_database_nss_unittest.cc |
| =================================================================== |
| --- net/base/cert_database_nss_unittest.cc (revision 98480) |
| +++ net/base/cert_database_nss_unittest.cc (working copy) |
| @@ -283,7 +283,7 @@ |
| scoped_refptr<X509Certificate> cert(cert_list[0]); |
| EXPECT_EQ("Test CA", cert->subject().common_name); |
| - EXPECT_EQ(CertDatabase::TRUSTED_SSL, |
| + EXPECT_EQ(static_cast<unsigned int>(CertDatabase::TRUSTED_SSL), |
| cert_db_.GetCertTrust(cert.get(), CA_CERT)); |
|
wtc
2011/08/26 21:20:53
Are these static_casts to unsigned int necessary b
Peter Kasting
2011/08/26 21:32:51
MSVC seems to choose whether an enum's underlying
|
| psm::nsNSSCertTrust trust(cert->os_cert_handle()->trust); |
| @@ -315,7 +315,7 @@ |
| scoped_refptr<X509Certificate> cert(cert_list[0]); |
| EXPECT_EQ("Test CA", cert->subject().common_name); |
| - EXPECT_EQ(CertDatabase::TRUSTED_EMAIL, |
| + EXPECT_EQ(static_cast<unsigned int>(CertDatabase::TRUSTED_EMAIL), |
| cert_db_.GetCertTrust(cert.get(), CA_CERT)); |
| psm::nsNSSCertTrust trust(cert->os_cert_handle()->trust); |
| @@ -346,7 +346,7 @@ |
| scoped_refptr<X509Certificate> cert(cert_list[0]); |
| EXPECT_EQ("Test CA", cert->subject().common_name); |
| - EXPECT_EQ(CertDatabase::TRUSTED_OBJ_SIGN, |
| + EXPECT_EQ(static_cast<unsigned int>(CertDatabase::TRUSTED_OBJ_SIGN), |
| cert_db_.GetCertTrust(cert.get(), CA_CERT)); |
| psm::nsNSSCertTrust trust(cert->os_cert_handle()->trust); |
| @@ -533,7 +533,7 @@ |
| EXPECT_EQ("www.google.com", goog_cert->subject().common_name); |
| EXPECT_EQ("Thawte SGC CA", thawte_cert->subject().common_name); |
| - EXPECT_EQ(CertDatabase::UNTRUSTED, |
| + EXPECT_EQ(static_cast<unsigned int>(CertDatabase::UNTRUSTED), |
| cert_db_.GetCertTrust(goog_cert.get(), SERVER_CERT)); |
| psm::nsNSSCertTrust goog_trust(goog_cert->os_cert_handle()->trust); |
| EXPECT_TRUE(goog_trust.HasPeer(PR_TRUE, PR_TRUE, PR_TRUE)); |
| @@ -558,7 +558,7 @@ |
| ASSERT_EQ(1U, cert_list.size()); |
| scoped_refptr<X509Certificate> puny_cert(cert_list[0]); |
| - EXPECT_EQ(CertDatabase::UNTRUSTED, |
| + EXPECT_EQ(static_cast<unsigned int>(CertDatabase::UNTRUSTED), |
| cert_db_.GetCertTrust(puny_cert.get(), SERVER_CERT)); |
| psm::nsNSSCertTrust puny_trust(puny_cert->os_cert_handle()->trust); |
| EXPECT_TRUE(puny_trust.HasPeer(PR_TRUE, PR_TRUE, PR_TRUE)); |