Make NSSCertDatabase::ListCerts work async on a worker thread.

net/cert/nss_cert_database_chromeos.cc

Index: net/cert/nss_cert_database_chromeos.cc
diff --git a/net/cert/nss_cert_database_chromeos.cc b/net/cert/nss_cert_database_chromeos.cc
index 936287c2204fa75f5b350540d4363d910952760e..1f14143787000be0f9bedbc6c50ae1eb509d6656 100644
--- a/net/cert/nss_cert_database_chromeos.cc
+++ b/net/cert/nss_cert_database_chromeos.cc
@@ -7,6 +7,10 @@
 #include <cert.h>
 #include <pk11pub.h>
 
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/location.h"
+#include "base/task_runner.h"
 #include "net/base/crypto_module.h"
 #include "net/cert/x509_certificate.h"
 
@@ -22,18 +26,22 @@ NSSCertDatabaseChromeOS::NSSCertDatabaseChromeOS(
 
 NSSCertDatabaseChromeOS::~NSSCertDatabaseChromeOS() {}
 
-void NSSCertDatabaseChromeOS::ListCerts(CertificateList* certs) {
-  NSSCertDatabase::ListCerts(certs);
+void NSSCertDatabaseChromeOS::ListCertsSync(CertificateList* certs) {
+  scoped_ptr<NSSProfileFilterChromeOS> filter(profile_filter_.CreateCopy());
+  ListCertsImpl(filter.Pass(), certs);
+}
 
-  size_t pre_size = certs->size();
-  certs->erase(std::remove_if(
-                   certs->begin(),
-                   certs->end(),
-                   NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate(
-                       profile_filter_)),
-               certs->end());
-  DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size
-           << " certs";
+void NSSCertDatabaseChromeOS::ListCerts(
+    const base::Callback<void(scoped_ptr<CertificateList> certs)>& callback) {
+  scoped_ptr<CertificateList> certs(new CertificateList());
+  CertificateList* raw_certs = certs.get();
+
+  GetSlowTaskRunner()->PostTaskAndReply(
+      FROM_HERE,
+      base::Bind(&NSSCertDatabaseChromeOS::ListCertsImpl,
+                 base::Passed(profile_filter_.CreateCopy()),
+                 base::Unretained(raw_certs)),
+      base::Bind(callback, base::Passed(&certs)));
 }
 
 crypto::ScopedPK11Slot NSSCertDatabaseChromeOS::GetPublicSlot() const {
@@ -62,4 +70,20 @@ void NSSCertDatabaseChromeOS::ListModules(CryptoModuleList* modules,
            << " modules";
 }
 
+void NSSCertDatabaseChromeOS::ListCertsImpl(
+    scoped_ptr<NSSProfileFilterChromeOS> profile_filter,
+    CertificateList* certs) {
+  NSSCertDatabase::ListCertsImpl(certs);
+
+  size_t pre_size = certs->size();
+  certs->erase(std::remove_if(

[Ryan Sleevi, 2014/01/30 04:16:30]

IWYU: include <algorithm> if using remove_if

[tbarzic, 2014/02/03 23:42:05]

Done.

+                   certs->begin(),
+                   certs->end(),
+                   NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate(
+                       *profile_filter)),
+               certs->end());
+  DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size
+           << " certs";
+}
+
 }  // namespace net