Refactor client cert private key handling.

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 518944650747e6a3dc7f39c58b4b4d7cb1610758..646ec4160d0039e3acba634bf8403a3835a6aeea 100644
--- a/net/http/http_cache_transaction.cc
+++ b/net/http/http_cache_transaction.cc
@@ -309,8 +309,8 @@ int HttpCache::Transaction::RestartIgnoringLastError(
 }
 
 int HttpCache::Transaction::RestartWithCertificate(
-    X509Certificate* client_cert,
-    SSLPrivateKey* client_private_key,
+    scoped_refptr<X509Certificate> client_cert,
+    scoped_refptr<SSLPrivateKey> client_private_key,
     const CompletionCallback& callback) {
   DCHECK(!callback.is_null());
 
@@ -320,8 +320,8 @@ int HttpCache::Transaction::RestartWithCertificate(
   if (!cache_.get())
     return ERR_UNEXPECTED;
 
-  int rv =
-      RestartNetworkRequestWithCertificate(client_cert, client_private_key);
+  int rv = RestartNetworkRequestWithCertificate(std::move(client_cert),
+                                                std::move(client_private_key));
 
   if (rv == ERR_IO_PENDING)
     callback_ = callback;
@@ -2255,15 +2255,15 @@ int HttpCache::Transaction::RestartNetworkRequest() {
 }
 
 int HttpCache::Transaction::RestartNetworkRequestWithCertificate(
-    X509Certificate* client_cert,
-    SSLPrivateKey* client_private_key) {
+    scoped_refptr<X509Certificate> client_cert,
+    scoped_refptr<SSLPrivateKey> client_private_key) {
   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, client_private_key, io_callback_);
+      std::move(client_cert), std::move(client_private_key), io_callback_);
   if (rv != ERR_IO_PENDING)
     return DoLoop(rv);
   return rv;