Use TaskScheduler instead of WorkerPool in nss_cert_database.cc.

chromeos/cert_loader_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_scheduler.h"
 #include "crypto/scoped_nss_types.h"
 #include "crypto/scoped_test_nss_db.h"
 #include "net/cert/nss_cert_database_chromeos.h"
 #include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace {
@@ skipping 70 matching lines @@
     return result;
   }
 
   void CreateCertDatabase(crypto::ScopedTestNSSDB* db,
                           std::unique_ptr<TestNSSCertDatabase>* certdb) {
     ASSERT_TRUE(db->is_open());
 
     certdb->reset(new TestNSSCertDatabase(
         crypto::ScopedPK11Slot(PK11_ReferenceSlot(db->slot())),
         crypto::ScopedPK11Slot(PK11_ReferenceSlot(db->slot()))));
-    (*certdb)->SetSlowTaskRunnerForTest(message_loop_.task_runner());
   }
 
   void ImportCACert(const std::string& cert_file,
                     net::NSSCertDatabase* database,
                     net::CertificateList* imported_certs) {
     ASSERT_TRUE(database);
     ASSERT_TRUE(imported_certs);
 
     *imported_certs = net::CreateCertificateListFromFile(
         net::GetTestCertsDirectory(),
@@ skipping 20 matching lines @@
   }
 
   CertLoader* cert_loader_;
 
   // The user is primary as the one whose certificates CertLoader handles, it
   // has nothing to do with crypto::InitializeNSSForChromeOSUser is_primary_user
   // parameter (which is irrelevant for these tests).
   crypto::ScopedTestNSSDB primary_db_;
   std::unique_ptr<TestNSSCertDatabase> primary_certdb_;
 
-  base::MessageLoop message_loop_;
+  base::test::ScopedTaskScheduler scoped_task_scheduler_;

[Ryan Sleevi, 2017/01/27 00:51:58]

Why don't you need to bind this to a message loop, as in the other tests?

[fdoray, 2017/02/02 17:56:32]

I improved the ScopedTaskScheduler documentation.
https://cs.chromium.org/chromium/src/base/test/scoped_task_scheduler.h

tl;dr ScopedTaskScheduler should be instantiated without arguments most of the
time. When it cohabits with a MessageLoopFor(UI|IO), it needs to be instantiated
with a pointer to it.

 
  private:
   size_t certificates_loaded_events_count_;
 };
 
 }  // namespace
 
 TEST_F(CertLoaderTest, Basic) {
   EXPECT_FALSE(cert_loader_->CertificatesLoading());
   EXPECT_FALSE(cert_loader_->certificates_loaded());
@@ skipping 119 matching lines @@
   ASSERT_TRUE(primary_certdb_->SetCertTrust(certs[0].get(), net::CA_CERT,
                                             net::NSSCertDatabase::TRUSTED_SSL));
 
   // Cert trust change should trigger certificate reload in cert_loader_.
   ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
 }
 
 }  // namespace chromeos