Plumbing SSLPrivateKey

net/http/http_cache_transaction.cc

Index: net/http/http_cache_transaction.cc
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
index 9dc77b04acb39a0e0acd6ff2af5fd5cf6c3d1a81..1ec292df4b89f863f99e8bc79c8e64a387887f9b 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -43,6 +43,7 @@
 #include "net/http/http_util.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/ssl/ssl_config_service.h"
+#include "net/ssl/ssl_private_key.h"

[davidben, 2015/09/25 20:10:11]

Not necessary

[svaldez, 2015/09/28 16:54:52]

Done.

 
 using base::Time;
 using base::TimeDelta;
@@ -406,6 +407,7 @@ int HttpCache::Transaction::RestartIgnoringLastError(
 
 int HttpCache::Transaction::RestartWithCertificate(
     X509Certificate* client_cert,
+    SSLPrivateKey* client_pkey,
     const CompletionCallback& callback) {
   DCHECK(!callback.is_null());
 
@@ -415,7 +417,7 @@ int HttpCache::Transaction::RestartWithCertificate(
   if (!cache_.get())
     return ERR_UNEXPECTED;
 
-  int rv = RestartNetworkRequestWithCertificate(client_cert);
+  int rv = RestartNetworkRequestWithCertificate(client_cert, client_pkey);
 
   if (rv == ERR_IO_PENDING)
     callback_ = callback;
@@ -2283,13 +2285,15 @@ int HttpCache::Transaction::RestartNetworkRequest() {
 }
 
 int HttpCache::Transaction::RestartNetworkRequestWithCertificate(
-    X509Certificate* client_cert) {
+    X509Certificate* client_cert,
+    SSLPrivateKey* client_pkey) {
   DCHECK(mode_ & WRITE || mode_ == NONE);
   DCHECK(network_trans_.get());
   DCHECK_EQ(STATE_NONE, next_state_);
 
   next_state_ = STATE_SEND_REQUEST_COMPLETE;
-  int rv = network_trans_->RestartWithCertificate(client_cert, io_callback_);
+  int rv = network_trans_->RestartWithCertificate(client_cert, client_pkey,
+                                                  io_callback_);
   if (rv != ERR_IO_PENDING)
     return DoLoop(rv);
   return rv;