Refactor client cert private key handling.

content/browser/loader/resource_loader.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/loader/resource_loader.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
@@ skipping 19 matching lines @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/common/resource_type.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/nqe/effective_connection_type.h"
 #include "net/nqe/network_quality_estimator.h"
 #include "net/ssl/client_cert_store.h"
-#include "net/ssl/ssl_platform_key.h"
-#include "net/ssl/ssl_private_key.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace content {
 namespace {
 
@@ skipping 410 matching lines @@
 }
 
 void ResourceLoader::ContinueSSLRequest() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   DVLOG(1) << "ContinueSSLRequest() url: " << request_->url().spec();
 
   request_->ContinueDespiteLastError();
 }
 
-void ResourceLoader::ContinueWithCertificate(net::X509Certificate* cert) {
+void ResourceLoader::ContinueWithCertificate(
+    scoped_refptr<net::X509Certificate> cert,
+    scoped_refptr<net::SSLPrivateKey> private_key) {
   DCHECK(ssl_client_auth_handler_);
   ssl_client_auth_handler_.reset();
-  if (!cert) {
-    request_->ContinueWithCertificate(nullptr, nullptr);
-    return;
-  }
-  scoped_refptr<net::SSLPrivateKey> private_key =
-      net::FetchClientCertPrivateKey(cert);
-  request_->ContinueWithCertificate(cert, private_key.get());
+  request_->ContinueWithCertificate(std::move(cert), std::move(private_key));
 }
 
 void ResourceLoader::CancelCertificateSelection() {
   DCHECK(ssl_client_auth_handler_);
   ssl_client_auth_handler_.reset();
   request_->CancelWithError(net::ERR_SSL_CLIENT_AUTH_CERT_NEEDED);
 }
 
 void ResourceLoader::Resume(bool called_from_resource_controller) {
   DCHECK(!is_transferring_);
@@ skipping 325 matching lines @@
       UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", prefetch_status,
                                 STATUS_MAX);
     }
   } else if (request_->response_info().unused_since_prefetch) {
     TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time();
     UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time);
   }
 }
 
 }  // namespace content