Use TaskScheduler instead of WorkerPool in nss_cert_database.cc.

net/cert/nss_cert_database.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_CERT_NSS_CERT_DATABASE_H_
 #define NET_CERT_NSS_CERT_DATABASE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_export.h"
 #include "net/cert/cert_type.h"
 #include "net/cert/x509_certificate.h"
 
 namespace base {
 template <class ObserverType>
 class ObserverListThreadSafe;
-class TaskRunner;
 }
 
 namespace net {
 
 class CryptoModule;
 typedef std::vector<scoped_refptr<CryptoModule> > CryptoModuleList;
 
 // Provides functions to manipulate the NSS certificate stores.
 // Forwards notifications about certificate changes to the global CertDatabase
 // singleton.
@@ skipping 203 matching lines @@
   // thread. Never calls |callback| synchronously.
   void DeleteCertAndKeyAsync(const scoped_refptr<X509Certificate>& cert,
                              const DeleteCertCallback& callback);
 
   // Check whether cert is stored in a readonly slot.
   bool IsReadOnly(const X509Certificate* cert) const;
 
   // Check whether cert is stored in a hardware slot.
   bool IsHardwareBacked(const X509Certificate* cert) const;
 
-  // Overrides task runner that's used for running slow tasks.
-  void SetSlowTaskRunnerForTest(
-      const scoped_refptr<base::TaskRunner>& task_runner);
-
  protected:
   // Certificate listing implementation used by |ListCerts*| and
   // |ListCertsSync|. Static so it may safely be used on the worker thread.
   // If |slot| is NULL, obtains the certs of all slots, otherwise only of
   // |slot|.
   static void ListCertsImpl(crypto::ScopedPK11Slot slot,
                             CertificateList* certs);
 
-  // Gets task runner that should be used for slow tasks like certificate
-  // listing. Defaults to a base::WorkerPool runner, but may be overriden
-  // in tests (see SetSlowTaskRunnerForTest).
-  scoped_refptr<base::TaskRunner> GetSlowTaskRunner() const;
-
  protected:
   // Broadcasts notifications to all registered observers.
   void NotifyObserversCertDBChanged(const X509Certificate* cert);
 
  private:
   // Registers |observer| to receive notifications of certificate changes.  The
   // thread on which this is called is the thread on which |observer| will be
   // called back with notifications.
   // NOTE: Observers registered here will only receive notifications generated
   // directly through the NSSCertDatabase, but not those from the CertDatabase.
@@ skipping 13 matching lines @@
   // Certificate removal implementation used by |DeleteCertAndKey*|. Static so
   // it may safely be used on the worker thread.
   static bool DeleteCertAndKeyImpl(scoped_refptr<X509Certificate> cert);
 
   crypto::ScopedPK11Slot public_slot_;
   crypto::ScopedPK11Slot private_slot_;
 
   // A helper observer that forwards events from this database to CertDatabase.
   std::unique_ptr<Observer> cert_notification_forwarder_;
 
-  // Task runner that should be used in tests if set.
-  scoped_refptr<base::TaskRunner> slow_task_runner_for_test_;
-
   const scoped_refptr<base::ObserverListThreadSafe<Observer>> observer_list_;
 
   base::WeakPtrFactory<NSSCertDatabase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NSSCertDatabase);
 };
 
 }  // namespace net
 
 #endif  // NET_CERT_NSS_CERT_DATABASE_H_