Use TaskScheduler instead of SequencedWorkerPool in component_updater_service_unittest.cc.
SequencedWorkerPool is being deprecated in favor of TaskScheduler.
BUG=667892
[email protected]
Review-Url: https://codereview.chromium.org/2876963003
Cr-Commit-Position: refs/heads/master@{#471426}
diff --git a/components/component_updater/component_updater_service_unittest.cc b/components/component_updater/component_updater_service_unittest.cc
index d833d200..8cf3130 100644
--- a/components/component_updater/component_updater_service_unittest.cc
+++ b/components/component_updater/component_updater_service_unittest.cc
@@ -17,8 +17,9 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/task_scheduler/post_task.h"
#include "base/test/histogram_tester.h"
-#include "base/test/sequenced_worker_pool_owner.h"
+#include "base/test/scoped_task_environment.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "components/component_updater/component_updater_service_internal.h"
@@ -115,14 +116,10 @@
void RunThreads();
private:
- static const int kNumWorkerThreads_ = 2;
-
- base::MessageLoopForUI message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
base::RunLoop runloop_;
base::Closure quit_closure_;
- std::unique_ptr<base::SequencedWorkerPoolOwner> worker_pool_;
-
scoped_refptr<TestConfigurator> config_;
scoped_refptr<MockUpdateClient> update_client_;
std::unique_ptr<ComponentUpdateService> component_updater_;
@@ -177,14 +174,13 @@
}
ComponentUpdaterTest::ComponentUpdaterTest()
- : worker_pool_(
- new base::SequencedWorkerPoolOwner(kNumWorkerThreads_, "test")) {
+ : scoped_task_environment_(
+ base::test::ScopedTaskEnvironment::MainThreadType::UI) {
quit_closure_ = runloop_.QuitClosure();
- auto pool = worker_pool_->pool();
config_ = new TestConfigurator(
- pool->GetSequencedTaskRunner(pool->GetSequenceToken()),
- message_loop_.task_runner());
+ base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()}),
+ base::ThreadTaskRunnerHandle::Get());
update_client_ = new MockUpdateClient();
EXPECT_CALL(update_client(), AddObserver(_)).Times(1);