Use TaskScheduler instead of WorkerPool in nss_cert_database.cc.

chromeos/network/network_connection_handler_unittest.cc

Index: chromeos/network/network_connection_handler_unittest.cc
diff --git a/chromeos/network/network_connection_handler_unittest.cc b/chromeos/network/network_connection_handler_unittest.cc
index 0a00870fbc454e6f786e4a1e28a9a5a4f25444e2..c9fb45475f9bc787a5114569c9fafa61a4346290 100644
--- a/chromeos/network/network_connection_handler_unittest.cc
+++ b/chromeos/network/network_connection_handler_unittest.cc
@@ -16,6 +16,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
+#include "base/test/scoped_task_scheduler.h"
 #include "chromeos/cert_loader.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
@@ -99,7 +100,9 @@ class TestNetworkConnectionObserver : public NetworkConnectionObserver {
 class NetworkConnectionHandlerTest : public testing::Test {
  public:
   NetworkConnectionHandlerTest()
-      : test_manager_client_(nullptr), test_service_client_(nullptr) {}
+      : test_manager_client_(nullptr),
+        test_service_client_(nullptr),
+        scoped_task_scheduler_(&message_loop_) {}
 
   ~NetworkConnectionHandlerTest() override {}
 
@@ -110,7 +113,6 @@ class NetworkConnectionHandlerTest : public testing::Test {
     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());
 
     CertLoader::Initialize();
     CertLoader::ForceHardwareBackedForTesting();
@@ -310,6 +312,7 @@ class NetworkConnectionHandlerTest : public testing::Test {
   crypto::ScopedTestNSSDB test_nssdb_;
   std::unique_ptr<net::NSSCertDatabaseChromeOS> test_nsscertdb_;
   base::MessageLoopForUI message_loop_;

[stevenjb, 2017/02/03 18:01:04]

It doesn't look like we use/need this at all here?

[fdoray, 2017/02/03 19:23:07]

In theory, the test could depend on MessageLoopForUI features (e.g. pumping
input events in RunLoop). However, I removed the MessageLoopForUI in the latest
patch set and bots seem to be happy.

[stevenjb, 2017/02/03 20:04:50]

Yeah, we shouldn't need that any more for this unit test. Cool.

+  base::test::ScopedTaskScheduler scoped_task_scheduler_;
   std::string result_;
 
  private: