| Index: content/browser/loader/resource_loader.cc
|
| diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
|
| index d2a1bb1945d964138dc397963ac3b25c743c83b9..c5c28ab8683d1914eda1603a4d206593c53ec9c6 100644
|
| --- a/content/browser/loader/resource_loader.cc
|
| +++ b/content/browser/loader/resource_loader.cc
|
| @@ -37,8 +37,6 @@
|
| #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"
|
| @@ -469,16 +467,12 @@ void ResourceLoader::ContinueSSLRequest() {
|
| 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() {
|
|
|