Refactor client cert private key handling.

net/ssl/client_cert_store_nss.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_NSS_H_
 #define NET_SSL_CLIENT_CERT_STORE_NSS_H_
 
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 17 matching lines @@
       const HostPortPair& /* server */)> PasswordDelegateFactory;
 
   explicit ClientCertStoreNSS(
       const PasswordDelegateFactory& password_delegate_factory);
   ~ClientCertStoreNSS() override;
 
   // ClientCertStore:
   void GetClientCerts(const SSLCertRequestInfo& cert_request_info,
                       const ClientCertListCallback& callback) override;
 
-  // Examines the certificates in |certs| to find all certificates that match
-  // the client certificate request in |request|, storing the matching
-  // certificates in |filtered_certs|. Any previous content of |filtered_certs|
-  // will be removed.
+  // Examines the certificates in |identities| to find all certificates that
+  // match the client certificate request in |request|, removing any that don't.
+  // The remaining certs will be updated to include intermediates.
   // Must be called from a worker thread.
-  static void FilterCertsOnWorkerThread(const CertificateList& certs,
-                                        const SSLCertRequestInfo& request,
-                                        CertificateList* filtered_certs);
+  static void FilterCertsOnWorkerThread(ClientCertIdentityList* identities,
+                                        const SSLCertRequestInfo& request);
 
   // Retrieves all client certificates that are stored by NSS and adds them to
-  // |certs|. |password_delegate| is used to unlock slots if required.
+  // |identities|. |password_delegate| is used to unlock slots if required.
   // Must be called from a worker thread.
   static void GetPlatformCertsOnWorkerThread(
-      std::unique_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
+      scoped_refptr<crypto::CryptoModuleBlockingPasswordDelegate>
           password_delegate,
-      net::CertificateList* certs);
+      ClientCertIdentityList* identities);
 
  private:
-  CertificateList GetAndFilterCertsOnWorkerThread(
-      std::unique_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
+  ClientCertIdentityList GetAndFilterCertsOnWorkerThread(
+      scoped_refptr<crypto::CryptoModuleBlockingPasswordDelegate>
           password_delegate,
       const SSLCertRequestInfo* request);
 
   // The factory for creating the delegate for requesting a password to a
   // PKCS#11 token. May be null.
   PasswordDelegateFactory password_delegate_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientCertStoreNSS);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_CLIENT_CERT_STORE_NSS_H_