Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: net/ssl/client_cert_store_chromeos_unittest.cc

Issue 574513003: Remove implicit conversions from scoped_refptr to T* in net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cert/nss_cert_database_chromeos_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/client_cert_store_chromeos_unittest.cc
diff --git a/net/ssl/client_cert_store_chromeos_unittest.cc b/net/ssl/client_cert_store_chromeos_unittest.cc
index 0d381ea28831931a8d61931f3bba29d4ab632290..f6a07ff6568248787920682d80533f85f341cd62 100644
--- a/net/ssl/client_cert_store_chromeos_unittest.cc
+++ b/net/ssl/client_cert_store_chromeos_unittest.cc
@@ -177,7 +177,7 @@ TEST_F(ClientCertStoreChromeOSTest, RequestWaitsForNSSInitAndSucceeds) {
ClientCertStoreChromeOS::PasswordDelegateFactory());
scoped_refptr<X509Certificate> cert_1(
ImportCertForUser(user.username_hash(), "client_1.pem", "client_1.pk8"));
- ASSERT_TRUE(cert_1);
+ ASSERT_TRUE(cert_1.get());
// Request any client certificate, which is expected to match client_1.
scoped_refptr<SSLCertRequestInfo> request_all(new SSLCertRequestInfo());
@@ -217,7 +217,7 @@ TEST_F(ClientCertStoreChromeOSTest, RequestsAfterNSSInitSucceed) {
ClientCertStoreChromeOS::PasswordDelegateFactory());
scoped_refptr<X509Certificate> cert_1(
ImportCertForUser(user.username_hash(), "client_1.pem", "client_1.pk8"));
- ASSERT_TRUE(cert_1);
+ ASSERT_TRUE(cert_1.get());
scoped_refptr<SSLCertRequestInfo> request_all(new SSLCertRequestInfo());
@@ -254,10 +254,10 @@ TEST_F(ClientCertStoreChromeOSTest, RequestDoesCrossReadOtherUserDB) {
scoped_refptr<X509Certificate> cert_1(
ImportCertForUser(user1.username_hash(), "client_1.pem", "client_1.pk8"));
- ASSERT_TRUE(cert_1);
+ ASSERT_TRUE(cert_1.get());
scoped_refptr<X509Certificate> cert_2(
ImportCertForUser(user2.username_hash(), "client_2.pem", "client_2.pk8"));
- ASSERT_TRUE(cert_2);
+ ASSERT_TRUE(cert_2.get());
scoped_refptr<SSLCertRequestInfo> request_all(new SSLCertRequestInfo());
@@ -275,11 +275,11 @@ TEST_F(ClientCertStoreChromeOSTest, RequestDoesCrossReadOtherUserDB) {
// store1 should only return certs of user1, namely cert_1.
ASSERT_EQ(1u, selected_certs1.size());
- EXPECT_TRUE(cert_1->Equals(selected_certs1[0]));
+ EXPECT_TRUE(cert_1->Equals(selected_certs1[0].get()));
// store2 should only return certs of user2, namely cert_2.
ASSERT_EQ(1u, selected_certs2.size());
- EXPECT_TRUE(cert_2->Equals(selected_certs2[0]));
+ EXPECT_TRUE(cert_2->Equals(selected_certs2[0].get()));
}
// This verifies that a request in the context of User1 doesn't see certificates
@@ -299,13 +299,13 @@ TEST_F(ClientCertStoreChromeOSTest, RequestDoesCrossReadSystemDB) {
scoped_refptr<X509Certificate> cert_1(
ImportCertForUser(user1.username_hash(), "client_1.pem", "client_1.pk8"));
- ASSERT_TRUE(cert_1);
+ ASSERT_TRUE(cert_1.get());
scoped_refptr<X509Certificate> cert_2(
ImportClientCertAndKeyFromFile(GetTestCertsDirectory(),
"client_2.pem",
"client_2.pk8",
system_slot.slot()));
- ASSERT_TRUE(cert_2);
+ ASSERT_TRUE(cert_2.get());
scoped_refptr<SSLCertRequestInfo> request_all(new SSLCertRequestInfo());
@@ -318,7 +318,7 @@ TEST_F(ClientCertStoreChromeOSTest, RequestDoesCrossReadSystemDB) {
// store should only return certs of the user, namely cert_1.
ASSERT_EQ(1u, selected_certs.size());
- EXPECT_TRUE(cert_1->Equals(selected_certs[0]));
+ EXPECT_TRUE(cert_1->Equals(selected_certs[0].get()));
}
} // namespace net
« no previous file with comments | « net/cert/nss_cert_database_chromeos_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698