Use TaskScheduler instead of WorkerPool in client_cert_store_chromeos.cc.

chrome/browser/chromeos/net/client_cert_store_chromeos_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 "chrome/browser/chromeos/net/client_cert_store_chromeos.h"
 
-#include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
+#include "base/test/scoped_task_scheduler.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"
 #include "crypto/scoped_test_nss_db.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
@@ skipping 43 matching lines @@
   bool init_finished_;
   bool init_called_ = false;
   base::Closure pending_callback_;
   scoped_refptr<net::X509Certificate> not_allowed_cert_;
 };
 
 }  // namespace
 
 class ClientCertStoreChromeOSTest : public ::testing::Test {
  public:
-  ClientCertStoreChromeOSTest() : message_loop_(new base::MessageLoopForIO()) {}
+  ClientCertStoreChromeOSTest() {}
 
   scoped_refptr<net::X509Certificate> ImportCertToSlot(
       const std::string& cert_filename,
       const std::string& key_filename,
       PK11SlotInfo* slot) {
     return net::ImportClientCertAndKeyFromFile(
         net::GetTestCertsDirectory(), cert_filename, key_filename, slot);
   }
 
  private:
-  std::unique_ptr<base::MessageLoop> message_loop_;
+  base::test::ScopedTaskScheduler scoped_task_scheduler_;
+  base::MessageLoopForIO message_loop_;
 };
 
 // Ensure that cert requests, that are started before the filter is initialized,
 // will wait for the initialization and succeed afterwards.
 TEST_F(ClientCertStoreChromeOSTest, RequestWaitsForNSSInitAndSucceeds) {
   crypto::ScopedTestNSSDB test_db;
   ASSERT_TRUE(test_db.is_open());
 
   TestCertFilter* cert_filter =
       new TestCertFilter(false /* init asynchronously */);
@@ skipping 125 matching lines @@
   base::RunLoop run_loop;
   net::CertificateList selected_certs;
   store.GetClientCerts(*request, &selected_certs, run_loop.QuitClosure());
   run_loop.Run();
 
   ASSERT_EQ(1u, selected_certs.size());
   EXPECT_TRUE(cert_1->Equals(selected_certs[0].get()));
 }
 
 }  // namespace chromeos