Revert of Use TaskScheduler instead of WorkerPool in nss_cert_database.cc.

chromeos/network/network_cert_migrator_unittest.cc

 // Copyright 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/network/network_cert_migrator.h"
 
 #include <cert.h>
 #include <pk11pub.h>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/test/scoped_task_scheduler.h"
 #include "chromeos/cert_loader.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_state_handler.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"
@@ skipping 16 matching lines @@
  public:
   NetworkCertMigratorTest() : service_test_(nullptr) {}
   ~NetworkCertMigratorTest() override {}
 
   void SetUp() override {
     ASSERT_TRUE(test_nssdb_.is_open());
     // Use the same DB for public and private slot.
     test_nsscertdb_.reset(new net::NSSCertDatabaseChromeOS(
         crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot())),
         crypto::ScopedPK11Slot(PK11_ReferenceSlot(test_nssdb_.slot()))));
+    test_nsscertdb_->SetSlowTaskRunnerForTest(message_loop_.task_runner());
 
     DBusThreadManager::Initialize();
     service_test_ =
         DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
     DBusThreadManager::Get()
         ->GetShillProfileClient()
         ->GetTestInterface()
         ->AddProfile(kProfile, "" /* userhash */);
     base::RunLoop().RunUntilIdle();
     service_test_->ClearServices();
@@ skipping 120 matching lines @@
           shill::kL2tpIpsecClientCertSlotProperty, slot_id);
       provider->GetStringWithoutPathExpansion(
           shill::kL2tpIpsecClientCertIdProperty, pkcs11_id);
     }
   }
 
   ShillServiceClient::TestInterface* service_test_;
   scoped_refptr<net::X509Certificate> test_client_cert_;
   std::string test_client_cert_pkcs11_id_;
   std::string test_client_cert_slot_id_;
-  base::test::ScopedTaskScheduler scoped_task_scheduler_;
+  base::MessageLoop message_loop_;
 
  private:
   std::unique_ptr<NetworkStateHandler> network_state_handler_;
   std::unique_ptr<NetworkCertMigrator> network_cert_migrator_;
   crypto::ScopedTestNSSDB test_nssdb_;
   std::unique_ptr<net::NSSCertDatabaseChromeOS> test_nsscertdb_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkCertMigratorTest);
 };
 
@@ skipping 129 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   std::string pkcs11_id;
   std::string slot_id;
   GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id);
   EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id);
   EXPECT_EQ(test_client_cert_slot_id_, slot_id);
 }
 
 }  // namespace chromeos