Commit 8c7dae87 authored by Anna Malova's avatar Anna Malova Committed by Commit Bot

Convert ClientCertStoreNSSTest to use OnceClosure.

Bug: 1007815
Change-Id: Iafc5e48f25325e51b3733a3e7b5a5fe436e0954c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2080246Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Anna Malova <amalova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745991}
parent 2b5706e8
...@@ -35,17 +35,17 @@ namespace net { ...@@ -35,17 +35,17 @@ namespace net {
namespace { namespace {
void SaveIdentitiesAndQuitCallback(ClientCertIdentityList* out_identities, void SaveIdentitiesAndQuitCallback(ClientCertIdentityList* out_identities,
base::Closure quit_closure, base::OnceClosure quit_closure,
ClientCertIdentityList in_identities) { ClientCertIdentityList in_identities) {
*out_identities = std::move(in_identities); *out_identities = std::move(in_identities);
quit_closure.Run(); std::move(quit_closure).Run();
} }
void SavePrivateKeyAndQuitCallback(scoped_refptr<net::SSLPrivateKey>* out_key, void SavePrivateKeyAndQuitCallback(scoped_refptr<net::SSLPrivateKey>* out_key,
base::Closure quit_closure, base::OnceClosure quit_closure,
scoped_refptr<net::SSLPrivateKey> in_key) { scoped_refptr<net::SSLPrivateKey> in_key) {
*out_key = std::move(in_key); *out_key = std::move(in_key);
quit_closure.Run(); std::move(quit_closure).Run();
} }
} // namespace } // namespace
...@@ -106,9 +106,10 @@ TEST(ClientCertStoreNSSTest, BuildsCertificateChain) { ...@@ -106,9 +106,10 @@ TEST(ClientCertStoreNSSTest, BuildsCertificateChain) {
ClientCertIdentityList selected_identities; ClientCertIdentityList selected_identities;
base::RunLoop loop; base::RunLoop loop;
store->GetClientCerts(*request.get(), store->GetClientCerts(
base::Bind(SaveIdentitiesAndQuitCallback, *request.get(),
&selected_identities, loop.QuitClosure())); base::BindOnce(SaveIdentitiesAndQuitCallback, &selected_identities,
loop.QuitClosure()));
loop.Run(); loop.Run();
// The result be |client_1| with no intermediates. // The result be |client_1| with no intermediates.
...@@ -140,9 +141,10 @@ TEST(ClientCertStoreNSSTest, BuildsCertificateChain) { ...@@ -140,9 +141,10 @@ TEST(ClientCertStoreNSSTest, BuildsCertificateChain) {
ClientCertIdentityList selected_identities; ClientCertIdentityList selected_identities;
base::RunLoop loop; base::RunLoop loop;
store->GetClientCerts(*request.get(), store->GetClientCerts(
base::Bind(SaveIdentitiesAndQuitCallback, *request.get(),
&selected_identities, loop.QuitClosure())); base::BindOnce(SaveIdentitiesAndQuitCallback, &selected_identities,
loop.QuitClosure()));
loop.Run(); loop.Run();
// The result be |client_1| with |client_1_ca| as an intermediate. // The result be |client_1| with |client_1_ca| as an intermediate.
...@@ -218,9 +220,9 @@ TEST(ClientCertStoreNSSTest, SubjectPrintableStringContainingUTF8) { ...@@ -218,9 +220,9 @@ TEST(ClientCertStoreNSSTest, SubjectPrintableStringContainingUTF8) {
ClientCertIdentityList selected_identities; ClientCertIdentityList selected_identities;
base::RunLoop loop; base::RunLoop loop;
store->GetClientCerts(*request.get(), store->GetClientCerts(
base::Bind(SaveIdentitiesAndQuitCallback, *request.get(), base::BindOnce(SaveIdentitiesAndQuitCallback,
&selected_identities, loop.QuitClosure())); &selected_identities, loop.QuitClosure()));
loop.Run(); loop.Run();
// The result be |cert| with no intermediates. // The result be |cert| with no intermediates.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment