Revert of Remove client_certs from SSLCertRequestInfo.

chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc

Index: chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc b/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
index b5d4d3cb878cf1095f4c0dd380767ca1eb8bb4e9..c3c63f9bb7dc13f76d0cbe8b9c31ed8d091ef882 100644
--- a/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/net/client_cert_store_chromeos_unittest.cc
@@ -73,13 +73,6 @@
   scoped_refptr<net::X509Certificate> not_allowed_cert_;
 };
 
-void SaveCertsAndQuitCallback(net::CertificateList* out_certs,
-                              base::Closure quit_closure,
-                              net::CertificateList in_certs) {
-  *out_certs = std::move(in_certs);
-  quit_closure.Run();
-}
-
 }  // namespace
 
 class ClientCertStoreChromeOSTest : public ::testing::Test {
@@ -118,24 +111,22 @@
   scoped_refptr<net::SSLCertRequestInfo> request_all(
       new net::SSLCertRequestInfo());
 
-  net::CertificateList selected_certs;
   base::RunLoop run_loop;
-  store.GetClientCerts(*request_all,
-                       base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                  run_loop.QuitClosure()));
+  store.GetClientCerts(*request_all, &request_all->client_certs,
+                       run_loop.QuitClosure());
 
   {
     base::RunLoop run_loop_inner;
     run_loop_inner.RunUntilIdle();
     // GetClientCerts should wait for the initialization of the filter to
     // finish.
-    ASSERT_EQ(0u, selected_certs.size());
+    ASSERT_EQ(0u, request_all->client_certs.size());
     EXPECT_TRUE(cert_filter->init_called());
   }
   cert_filter->FinishInit();
   run_loop.Run();
 
-  ASSERT_EQ(1u, selected_certs.size());
+  ASSERT_EQ(1u, request_all->client_certs.size());
 }
 
 // Ensure that cert requests, that are started after the filter was initialized,
@@ -157,13 +148,11 @@
       new net::SSLCertRequestInfo());
 
   base::RunLoop run_loop;
-  net::CertificateList selected_certs;
-  store.GetClientCerts(*request_all,
-                       base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                  run_loop.QuitClosure()));
+  store.GetClientCerts(*request_all, &request_all->client_certs,
+                       run_loop.QuitClosure());
   run_loop.Run();
 
-  ASSERT_EQ(1u, selected_certs.size());
+  ASSERT_EQ(1u, request_all->client_certs.size());
 }
 
 TEST_F(ClientCertStoreChromeOSTest, Filter) {
@@ -190,9 +179,7 @@
     base::RunLoop run_loop;
     cert_filter->SetNotAllowedCert(cert_2);
     net::CertificateList selected_certs;
-    store.GetClientCerts(*request_all,
-                         base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                    run_loop.QuitClosure()));
+    store.GetClientCerts(*request_all, &selected_certs, run_loop.QuitClosure());
     run_loop.Run();
 
     ASSERT_EQ(1u, selected_certs.size());
@@ -203,9 +190,7 @@
     base::RunLoop run_loop;
     cert_filter->SetNotAllowedCert(cert_1);
     net::CertificateList selected_certs;
-    store.GetClientCerts(*request_all,
-                         base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                    run_loop.QuitClosure()));
+    store.GetClientCerts(*request_all, &selected_certs, run_loop.QuitClosure());
     run_loop.Run();
 
     ASSERT_EQ(1u, selected_certs.size());
@@ -241,9 +226,7 @@
 
   base::RunLoop run_loop;
   net::CertificateList selected_certs;
-  store.GetClientCerts(*request,
-                       base::Bind(SaveCertsAndQuitCallback, &selected_certs,
-                                  run_loop.QuitClosure()));
+  store.GetClientCerts(*request, &selected_certs, run_loop.QuitClosure());
   run_loop.Run();
 
   ASSERT_EQ(1u, selected_certs.size());