Revert of Remove client_certs from SSLCertRequestInfo.

chrome/browser/chromeos/net/client_cert_store_chromeos.cc

Index: chrome/browser/chromeos/net/client_cert_store_chromeos.cc
diff --git a/chrome/browser/chromeos/net/client_cert_store_chromeos.cc b/chrome/browser/chromeos/net/client_cert_store_chromeos.cc
index 48c3cb7a8818ca792a1df39b8232a08c74c23982..7174c202c38c00a4fdb2430ae3fd565fadc383ad 100644
--- a/chrome/browser/chromeos/net/client_cert_store_chromeos.cc
+++ b/chrome/browser/chromeos/net/client_cert_store_chromeos.cc
@@ -12,7 +12,6 @@
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/location.h"
-#include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"
 #include "crypto/nss_crypto_module_delegate.h"
@@ -48,13 +47,14 @@
 
 void ClientCertStoreChromeOS::GetClientCerts(
     const net::SSLCertRequestInfo& cert_request_info,
-    const ClientCertListCallback& callback) {
+    net::CertificateList* selected_certs,
+    const base::Closure& callback) {
   // Caller is responsible for keeping the ClientCertStore alive until the
   // callback is run.
   base::Callback<void(const net::CertificateList&)>
-      get_platform_certs_and_filter =
-          base::Bind(&ClientCertStoreChromeOS::GotAdditionalCerts,
-                     base::Unretained(this), &cert_request_info, callback);
+      get_platform_certs_and_filter = base::Bind(
+          &ClientCertStoreChromeOS::GotAdditionalCerts, base::Unretained(this),
+          &cert_request_info, selected_certs, callback);
 
   base::Closure get_additional_certs_and_continue;
   if (cert_provider_) {
@@ -72,7 +72,8 @@
 
 void ClientCertStoreChromeOS::GotAdditionalCerts(
     const net::SSLCertRequestInfo* request,
-    const ClientCertListCallback& callback,
+    net::CertificateList* selected_certs,
+    const base::Closure& callback,
     const net::CertificateList& additional_certs) {
   std::unique_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
       password_delegate;
@@ -80,24 +81,26 @@
     password_delegate.reset(
         password_delegate_factory_.Run(request->host_and_port));
   }
-  if (base::PostTaskAndReplyWithResult(
-          base::WorkerPool::GetTaskRunner(true /* task_is_slow */).get(),
+  if (base::WorkerPool::PostTaskAndReply(
           FROM_HERE,
           base::Bind(&ClientCertStoreChromeOS::GetAndFilterCertsOnWorkerThread,
                      base::Unretained(this), base::Passed(&password_delegate),
-                     request, additional_certs),
-          callback)) {
+                     request, additional_certs, selected_certs),
+          callback, true)) {
     return;
   }
-  // If the task could not be posted, behave as if there were no certificates.
-  callback.Run(net::CertificateList());
+  // If the task could not be posted, behave as if there were no certificates
+  // which requires to clear |selected_certs|.
+  selected_certs->clear();
+  callback.Run();
 }
 
-net::CertificateList ClientCertStoreChromeOS::GetAndFilterCertsOnWorkerThread(
+void ClientCertStoreChromeOS::GetAndFilterCertsOnWorkerThread(
     std::unique_ptr<crypto::CryptoModuleBlockingPasswordDelegate>
         password_delegate,
     const net::SSLCertRequestInfo* request,
-    const net::CertificateList& additional_certs) {
+    const net::CertificateList& additional_certs,
+    net::CertificateList* selected_certs) {
   net::CertificateList unfiltered_certs;
   net::ClientCertStoreNSS::GetPlatformCertsOnWorkerThread(
       std::move(password_delegate), &unfiltered_certs);
@@ -110,10 +113,8 @@
   unfiltered_certs.insert(unfiltered_certs.end(), additional_certs.begin(),
                           additional_certs.end());
 
-  net::CertificateList selected_certs;
   net::ClientCertStoreNSS::FilterCertsOnWorkerThread(unfiltered_certs, *request,
-                                                     &selected_certs);
-  return selected_certs;
+                                                     selected_certs);
 }
 
 }  // namespace chromeos