Plumbing SSLPrivateKey

content/browser/ssl/ssl_client_auth_handler.cc

Index: content/browser/ssl/ssl_client_auth_handler.cc
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index e52864398b9f859f255f891f4507912ee74cb732..7963653b12cba26ad833e1cf5dff4e4820eae076 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -36,13 +36,14 @@ class ClientCertificateDelegateImpl : public ClientCertificateDelegate {
   }
 
   // ClientCertificateDelegate implementation:
-  void ContinueWithCertificate(net::X509Certificate* cert) override {
+  void ContinueWithCertificate(net::X509Certificate* cert,
+                               net::SSLPrivateKey* pkey) override {
     DCHECK(!continue_called_);
     continue_called_ = true;
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SSLClientAuthHandler::ContinueWithCertificate, handler_,
-                   make_scoped_refptr(cert)));
+                   make_scoped_refptr(cert), make_scoped_refptr(pkey)));
   }
 
  private:
@@ -145,9 +146,10 @@ void SSLClientAuthHandler::SelectCertificate() {
 // static
 void SSLClientAuthHandler::ContinueWithCertificate(
     const base::WeakPtr<SSLClientAuthHandler>& handler,
-    net::X509Certificate* cert) {
+    net::X509Certificate* cert,
+    net::SSLPrivateKey* pkey) {
   if (handler)
-    handler->delegate_->ContinueWithCertificate(cert);
+    handler->delegate_->ContinueWithCertificate(cert, pkey);
 }
 
 // static
@@ -176,7 +178,8 @@ void SSLClientAuthHandler::DidGetClientCerts() {
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SSLClientAuthHandler::ContinueWithCertificate,
                    weak_factory_.GetWeakPtr(),
-                   scoped_refptr<net::X509Certificate>()));
+                   scoped_refptr<net::X509Certificate>(),
+                   scoped_refptr<net::SSLPrivateKey>()));
     return;
   }