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

Unified Diff: net/ssl/client_cert_store_impl_unittest.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 7 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/spdy/spdy_websocket_stream_spdy3_unittest.cc ('k') | net/ssl/default_server_bound_cert_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ssl/client_cert_store_impl_unittest.cc
diff --git a/net/ssl/client_cert_store_impl_unittest.cc b/net/ssl/client_cert_store_impl_unittest.cc
index 5e66f3d203d38ccd7ff4ca5b1c12bd76ca9d2e49..7b05ef200ea136477479a77805016315cad67015 100644
--- a/net/ssl/client_cert_store_impl_unittest.cc
+++ b/net/ssl/client_cert_store_impl_unittest.cc
@@ -61,7 +61,7 @@ TEST_F(ClientCertStoreImplTest, EmptyQuery) {
scoped_refptr<SSLCertRequestInfo> request(new SSLCertRequestInfo());
std::vector<scoped_refptr<X509Certificate> > selected_certs;
- bool rv = SelectClientCerts(certs, *request, &selected_certs);
+ bool rv = SelectClientCerts(certs, *request.get(), &selected_certs);
EXPECT_TRUE(rv);
EXPECT_EQ(0u, selected_certs.size());
}
@@ -71,17 +71,17 @@ TEST_F(ClientCertStoreImplTest, EmptyQuery) {
TEST_F(ClientCertStoreImplTest, AllIssuersAllowed) {
scoped_refptr<X509Certificate> cert(
ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem"));
- ASSERT_TRUE(cert);
+ ASSERT_TRUE(cert.get());
std::vector<scoped_refptr<X509Certificate> > certs;
certs.push_back(cert);
scoped_refptr<SSLCertRequestInfo> request(new SSLCertRequestInfo());
std::vector<scoped_refptr<X509Certificate> > selected_certs;
- bool rv = SelectClientCerts(certs, *request, &selected_certs);
+ bool rv = SelectClientCerts(certs, *request.get(), &selected_certs);
EXPECT_TRUE(rv);
ASSERT_EQ(1u, selected_certs.size());
- EXPECT_TRUE(selected_certs[0]->Equals(cert));
+ EXPECT_TRUE(selected_certs[0]->Equals(cert.get()));
}
// Verify that certificates are correctly filtered against CertRequestInfo with
@@ -89,10 +89,10 @@ TEST_F(ClientCertStoreImplTest, AllIssuersAllowed) {
TEST_F(ClientCertStoreImplTest, CertAuthorityFiltering) {
scoped_refptr<X509Certificate> cert_1(
ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem"));
- ASSERT_TRUE(cert_1);
+ ASSERT_TRUE(cert_1.get());
scoped_refptr<X509Certificate> cert_2(
ImportCertFromFile(GetTestCertsDirectory(), "client_2.pem"));
- ASSERT_TRUE(cert_2);
+ ASSERT_TRUE(cert_2.get());
std::vector<std::string> authority_1(
1, std::string(reinterpret_cast<const char*>(kAuthority1DN),
@@ -112,10 +112,10 @@ TEST_F(ClientCertStoreImplTest, CertAuthorityFiltering) {
request->cert_authorities = authority_1;
std::vector<scoped_refptr<X509Certificate> > selected_certs;
- bool rv = SelectClientCerts(certs, *request, &selected_certs);
+ bool rv = SelectClientCerts(certs, *request.get(), &selected_certs);
EXPECT_TRUE(rv);
ASSERT_EQ(1u, selected_certs.size());
- EXPECT_TRUE(selected_certs[0]->Equals(cert_1));
+ EXPECT_TRUE(selected_certs[0]->Equals(cert_1.get()));
}
#if defined(OS_MACOSX) && !defined(OS_IOS)
« no previous file with comments | « net/spdy/spdy_websocket_stream_spdy3_unittest.cc ('k') | net/ssl/default_server_bound_cert_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698