Refactor client cert private key handling.

content/browser/ssl/ssl_client_auth_handler.h

Index: content/browser/ssl/ssl_client_auth_handler.h
diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h
index ca9287446b09c243f388b04857b6dff32da8d9fe..98067ef522d114cf43a1f1cbde7a01258ecb695c 100644
--- a/content/browser/ssl/ssl_client_auth_handler.h
+++ b/content/browser/ssl/ssl_client_auth_handler.h
@@ -13,11 +13,12 @@
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/cert/x509_certificate.h"
+#include "net/ssl/client_cert_identity.h"
 #include "net/ssl/ssl_cert_request_info.h"
 
 namespace net {
 class ClientCertStore;
+class SSLPrivateKey;
 class URLRequest;
 class X509Certificate;
 }  // namespace net
@@ -37,7 +38,9 @@ class SSLClientAuthHandler {
     Delegate() {}
 
     // Called to continue the request with |cert|. |cert| may be nullptr.
-    virtual void ContinueWithCertificate(net::X509Certificate* cert) = 0;
+    virtual void ContinueWithCertificate(
+        scoped_refptr<net::X509Certificate> cert,
+        scoped_refptr<net::SSLPrivateKey> private_key) = 0;
 
     // Called to cancel the certificate selection and abort the request.
     virtual void CancelCertificateSelection() = 0;
@@ -64,7 +67,8 @@ class SSLClientAuthHandler {
   // is static to avoid deleting |handler| while it is on the stack.
   static void ContinueWithCertificate(
       const base::WeakPtr<SSLClientAuthHandler>& handler,
-      net::X509Certificate* cert);
+      scoped_refptr<net::X509Certificate> cert,
+      scoped_refptr<net::SSLPrivateKey> key);
 
   // Called to abort the request associated with |handler|. This is static to
   // avoid deleting |handler| while it is on the stack.
@@ -75,7 +79,7 @@ class SSLClientAuthHandler {
   class Core;
 
   // Called when |core_| is done retrieving the cert list.
-  void DidGetClientCerts(net::CertificateList client_certs);
+  void DidGetClientCerts(net::ClientCertIdentityList client_certs);
 
   // A reference-counted core so the ClientCertStore may outlive
   // SSLClientAuthHandler if the handler is destroyed while an operation on the