Use TaskScheduler instead of WorkerPool in nss_cert_database.cc.

chromeos/network/auto_connect_handler_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/network/auto_connect_handler.h"
 
 #include <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_scheduler.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/cert_loader.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_device_client.h"
 #include "chromeos/dbus/shill_manager_client.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/client_cert_resolver.h"
 #include "chromeos/network/managed_network_configuration_handler_impl.h"
 #include "chromeos/network/network_configuration_handler.h"
@@ skipping 43 matching lines @@
  private:
   bool changed_network_properties_;
   ClientCertResolver* cert_resolver_;
 };
 
 }  // namespace
 
 class AutoConnectHandlerTest : public testing::Test {
  public:
   AutoConnectHandlerTest()
-      : test_manager_client_(nullptr), test_service_client_(nullptr) {}
+      : test_manager_client_(nullptr),
+        test_service_client_(nullptr),
+        scoped_task_scheduler_(&message_loop_) {}

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

It strikes me as profoundly surprising to see new code depending on
base::MessageLoop as part of its "public" interface - considering how much time
was spent trying to deprecate that.

It's also not clear to me why this one needs to be bound vs the others.

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

New ScopedTaskScheduler documentation addresses this comment.
https://cs.chromium.org/chromium/src/base/test/scoped_task_scheduler.h

 
   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());
 
     CertLoader::Initialize();
     CertLoader::ForceHardwareBackedForTesting();
 
     DBusThreadManager::Initialize();
     DBusThreadManager* dbus_manager = DBusThreadManager::Get();
     test_manager_client_ =
         dbus_manager->GetShillManagerClient()->GetTestInterface();
     test_service_client_ =
         dbus_manager->GetShillServiceClient()->GetTestInterface();
@@ skipping 21 matching lines @@
     managed_config_handler_.reset(new ManagedNetworkConfigurationHandlerImpl());
     managed_config_handler_->Init(
         network_state_handler_.get(), network_profile_handler_.get(),
         network_config_handler_.get(), nullptr /* network_device_handler */,
         nullptr /* prohibited_technologies_handler */);
 
     client_cert_resolver_.reset(new ClientCertResolver());
     client_cert_resolver_->Init(network_state_handler_.get(),
                                 managed_config_handler_.get());
     client_cert_resolver_->SetSlowTaskRunnerForTest(
         message_loop_.task_runner());

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

Can't we / shouldn't we be able to get rid of this and |message_loop_| here also
now?

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

Was taken care of in another CL. Latest patch set reflects it.

 
     auto_connect_handler_.reset(new AutoConnectHandler());
     auto_connect_handler_->Init(client_cert_resolver_.get(),
                                 nullptr,  // no connection handler
                                 network_state_handler_.get(),
                                 managed_config_handler_.get());
 
     base::RunLoop().RunUntilIdle();
   }
 
@@ skipping 102 matching lines @@
   std::unique_ptr<NetworkStateHandler> network_state_handler_;
   std::unique_ptr<NetworkConfigurationHandler> network_config_handler_;
   std::unique_ptr<ManagedNetworkConfigurationHandlerImpl>
       managed_config_handler_;
   std::unique_ptr<NetworkProfileHandler> network_profile_handler_;
   ShillManagerClient::TestInterface* test_manager_client_;
   ShillServiceClient::TestInterface* test_service_client_;
   crypto::ScopedTestNSSDB test_nssdb_;
   std::unique_ptr<net::NSSCertDatabaseChromeOS> test_nsscertdb_;
   base::MessageLoopForUI message_loop_;
+  base::test::ScopedTaskScheduler scoped_task_scheduler_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutoConnectHandlerTest);
 };
 
 namespace {
 
 const char* kConfigUnmanagedSharedConnected =
     "{ \"GUID\": \"wifi0\", \"Type\": \"wifi\", \"State\": \"online\", "
     "  \"Security\": \"wpa\" }";
@@ skipping 239 matching lines @@
   // Applying the user policy after login would usually trigger connecting to
   // the 'best' network. But the manual connect prevents this.
   SetupPolicy(std::string(),            // no network configs
               base::DictionaryValue(),  // no global config
               true);                    // load as user policy
   EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0"));
   EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1"));
 }
 
 }  // namespace chromeos