Index: content/browser/loader/resource_loader_unittest.cc |
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc |
index ff068e7a74036bb4bc3a7f589818649156062b22..5c526b592a8394d4ee23a235114a8afa8d226662 100644 |
--- a/content/browser/loader/resource_loader_unittest.cc |
+++ b/content/browser/loader/resource_loader_unittest.cc |
@@ -90,11 +90,13 @@ |
// net::ClientCertStore: |
void GetClientCerts(const net::SSLCertRequestInfo& cert_request_info, |
- const ClientCertListCallback& callback) override { |
+ net::CertificateList* selected_certs, |
+ const base::Closure& callback) override { |
*requested_authorities_ = cert_request_info.cert_authorities; |
++(*request_count_); |
- callback.Run(response_); |
+ *selected_certs = response_; |
+ callback.Run(); |
} |
private: |
@@ -116,13 +118,14 @@ |
on_loader_deleted_callback_(on_loader_deleted_callback) {} |
// net::ClientCertStore: |
- void GetClientCerts( |
- const net::SSLCertRequestInfo& cert_request_info, |
- const ClientCertListCallback& cert_selected_callback) override { |
+ void GetClientCerts(const net::SSLCertRequestInfo& cert_request_info, |
+ net::CertificateList* selected_certs, |
+ const base::Closure& cert_selected_callback) override { |
// Don't destroy |loader_| while it's on the stack. |
base::ThreadTaskRunnerHandle::Get()->PostTask( |
FROM_HERE, base::Bind(&LoaderDestroyingCertStore::DoCallback, |
- base::Unretained(loader_), cert_selected_callback, |
+ base::Unretained(loader_), |
+ cert_selected_callback, |
on_loader_deleted_callback_)); |
} |
@@ -131,10 +134,10 @@ |
// LoaderDestroyingCertStore (ClientCertStores are actually handles, and not |
// global cert stores). |
static void DoCallback(std::unique_ptr<ResourceLoader>* loader, |
- const ClientCertListCallback& cert_selected_callback, |
+ const base::Closure& cert_selected_callback, |
const base::Closure& on_loader_deleted_callback) { |
loader->reset(); |
- cert_selected_callback.Run(net::CertificateList()); |
+ cert_selected_callback.Run(); |
on_loader_deleted_callback.Run(); |
} |
@@ -277,12 +280,11 @@ |
void SelectClientCertificate( |
WebContents* web_contents, |
net::SSLCertRequestInfo* cert_request_info, |
- net::CertificateList client_certs, |
std::unique_ptr<ClientCertificateDelegate> delegate) override { |
EXPECT_FALSE(delegate_.get()); |
++call_count_; |
- passed_certs_ = std::move(client_certs); |
+ passed_certs_ = cert_request_info->client_certs; |
delegate_ = std::move(delegate); |
select_certificate_run_loop_.Quit(); |
} |