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

chromeos/cert_loader.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/cert_loader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"
 #include "crypto/nss_util.h"
 #include "net/cert/nss_cert_database.h"
 #include "net/cert/nss_cert_database_chromeos.h"
 #include "net/cert/x509_certificate.h"
 
 namespace chromeos {
 
-namespace {
-
-// Loads certificates from |cert_database| into |cert_list|.
-void LoadNSSCertificates(net::NSSCertDatabase* cert_database,
-                         net::CertificateList* cert_list) {
-  cert_database->ListCerts(cert_list);
-}
-
-}  // namespace
-
 static CertLoader* g_cert_loader = NULL;
 
 // static
 void CertLoader::Initialize() {
   CHECK(!g_cert_loader);
   g_cert_loader = new CertLoader();
 }
 
 // static
 void CertLoader::Shutdown() {
@@ skipping 51 matching lines @@
   std::string pkcs11_id;
   if (sec_item) {
     pkcs11_id = base::HexEncode(sec_item->data, sec_item->len);
     SECITEM_FreeItem(sec_item, PR_TRUE);
   }
   SECKEY_DestroyPrivateKey(priv_key);
 
   return pkcs11_id;
 }
 
-void CertLoader::SetSlowTaskRunnerForTest(
-    const scoped_refptr<base::TaskRunner>& task_runner) {
-  slow_task_runner_for_test_ = task_runner;
-}
-
 void CertLoader::AddObserver(CertLoader::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void CertLoader::RemoveObserver(CertLoader::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 bool CertLoader::IsCertificateHardwareBacked(
     const net::X509Certificate* cert) const {
@@ skipping 29 matching lines @@
 
 void CertLoader::LoadCertificates() {
   CHECK(thread_checker_.CalledOnValidThread());
   VLOG(1) << "LoadCertificates: " << certificates_update_running_;
 
   if (certificates_update_running_) {
     certificates_update_required_ = true;
     return;
   }
 
-  net::CertificateList* cert_list = new net::CertificateList;
   certificates_update_running_ = true;
   certificates_update_required_ = false;
 
-  base::TaskRunner* task_runner = slow_task_runner_for_test_.get();
-  if (!task_runner)
-    task_runner = base::WorkerPool::GetTaskRunner(true /* task is slow */);
-  task_runner->PostTaskAndReply(
-      FROM_HERE,
-      base::Bind(LoadNSSCertificates,
-                 // Create a copy of the database so it can be used on the
-                 // worker pool.
-                 base::Owned(new net::NSSCertDatabaseChromeOS(
-                     database_->GetPublicSlot(),
-                     database_->GetPrivateSlot())),
-                 cert_list),
-      base::Bind(&CertLoader::UpdateCertificates,
-                 weak_factory_.GetWeakPtr(),
-                 base::Owned(cert_list)));
+  database_->ListCerts(base::Bind(&CertLoader::UpdateCertificates,
+                                  weak_factory_.GetWeakPtr()));
 }
 
-void CertLoader::UpdateCertificates(net::CertificateList* cert_list) {
+void CertLoader::UpdateCertificates(
+    scoped_ptr<net::CertificateList> cert_list) {
   CHECK(thread_checker_.CalledOnValidThread());
   DCHECK(certificates_update_running_);
   VLOG(1) << "UpdateCertificates: " << cert_list->size();
 
   // Ignore any existing certificates.
   cert_list_.swap(*cert_list);
 
   bool initial_load = !certificates_loaded_;
   certificates_loaded_ = true;
   NotifyCertificatesLoaded(initial_load);
@@ skipping 19 matching lines @@
   VLOG(1) << "OnCertAdded";
   LoadCertificates();
 }
 
 void CertLoader::OnCertRemoved(const net::X509Certificate* cert) {
   VLOG(1) << "OnCertRemoved";
   LoadCertificates();
 }
 
 }  // namespace chromeos