Refactor client cert private key handling.

net/ssl/client_cert_store_unittest-inl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SSL_CLIENT_CERT_STORE_UNITTEST_INL_H_
 #define NET_SSL_CLIENT_CERT_STORE_UNITTEST_INL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 34 matching lines @@
 // implementations of ClientCertStore. These cases test the client cert
 // filtering behavior.
 //
 // NOTE: If any test cases are added, removed, or renamed, the
 // REGISTER_TYPED_TEST_CASE_P macro at the bottom of this file must be updated.
 //
 // The type T provided as the third argument to INSTANTIATE_TYPED_TEST_CASE_P by
 // the platform implementation should implement this method:
 // bool SelectClientCerts(const CertificateList& input_certs,
 //                        const SSLCertRequestInfo& cert_request_info,
-//                        CertificateList* selected_certs);
+//                        ClientCertIdentityList* selected_identities);
 template <typename T>
 class ClientCertStoreTest : public ::testing::Test {
  public:
   T delegate_;
 };
 
 TYPED_TEST_CASE_P(ClientCertStoreTest);
 
 TYPED_TEST_P(ClientCertStoreTest, EmptyQuery) {
-  std::vector<scoped_refptr<X509Certificate> > certs;
+  CertificateList certs;
   scoped_refptr<SSLCertRequestInfo> request(new SSLCertRequestInfo());
 
-  std::vector<scoped_refptr<X509Certificate> > selected_certs;
-  bool rv = this->delegate_.SelectClientCerts(
-      certs, *request.get(), &selected_certs);
+  ClientCertIdentityList selected_identities;
+  bool rv = this->delegate_.SelectClientCerts(certs, *request.get(),
+                                              &selected_identities);
   EXPECT_TRUE(rv);
-  EXPECT_EQ(0u, selected_certs.size());
+  EXPECT_EQ(0u, selected_identities.size());
 }
 
 // Verify that CertRequestInfo with empty |cert_authorities| matches all
 // issuers, rather than no issuers.
 TYPED_TEST_P(ClientCertStoreTest, AllIssuersAllowed) {
   scoped_refptr<X509Certificate> cert(
       ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem"));
   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 = this->delegate_.SelectClientCerts(
-      certs, *request.get(), &selected_certs);
+  ClientCertIdentityList selected_identities;
+  bool rv = this->delegate_.SelectClientCerts(certs, *request.get(),
+                                              &selected_identities);
   EXPECT_TRUE(rv);
-  ASSERT_EQ(1u, selected_certs.size());
-  EXPECT_TRUE(selected_certs[0]->Equals(cert.get()));
+  ASSERT_EQ(1u, selected_identities.size());
+  EXPECT_TRUE(selected_identities[0]->certificate()->Equals(cert.get()));
 }
 
 // Verify that certificates are correctly filtered against CertRequestInfo with
 // |cert_authorities| containing only |authority_1_DN|.
 // Flaky: https://crbug.com/716730
 TYPED_TEST_P(ClientCertStoreTest, DISABLED_CertAuthorityFiltering) {
   scoped_refptr<X509Certificate> cert_1(
       ImportCertFromFile(GetTestCertsDirectory(), "client_1.pem"));
   ASSERT_TRUE(cert_1.get());
   scoped_refptr<X509Certificate> cert_2(
@@ skipping 10 matching lines @@
   EXPECT_FALSE(cert_1->IsIssuedByEncoded(authority_2));
   EXPECT_TRUE(cert_2->IsIssuedByEncoded(authority_2));
   EXPECT_FALSE(cert_2->IsIssuedByEncoded(authority_1));
 
   std::vector<scoped_refptr<X509Certificate> > certs;
   certs.push_back(cert_1);
   certs.push_back(cert_2);
   scoped_refptr<SSLCertRequestInfo> request(new SSLCertRequestInfo());
   request->cert_authorities = authority_1;
 
-  std::vector<scoped_refptr<X509Certificate> > selected_certs;
-  bool rv = this->delegate_.SelectClientCerts(
-      certs, *request.get(), &selected_certs);
+  ClientCertIdentityList selected_identities;
+  bool rv = this->delegate_.SelectClientCerts(certs, *request.get(),
+                                              &selected_identities);
   EXPECT_TRUE(rv);
-  ASSERT_EQ(1u, selected_certs.size());
-  EXPECT_TRUE(selected_certs[0]->Equals(cert_1.get()));
+  ASSERT_EQ(1u, selected_identities.size());
+  EXPECT_TRUE(selected_identities[0]->certificate()->Equals(cert_1.get()));
 }
 
 REGISTER_TYPED_TEST_CASE_P(ClientCertStoreTest,
                            EmptyQuery,
                            AllIssuersAllowed,
                            DISABLED_CertAuthorityFiltering);
 
 }  // namespace net
 
 #endif  // NET_SSL_CLIENT_CERT_STORE_UNITTEST_INL_H_