Eliminate task runner injection from the configurator.
The new task scheduler API makes it possible to simplify the
configurator and avoid injecting task runners.
Bug: 740992
Change-Id: Iaabdc498993745372cee47193f16f1df4d09f7a2
Reviewed-on: https://chromium-review.googlesource.com/582030
Reviewed-by: David Roger <[email protected]>
Reviewed-by: Joshua Pawlicki <[email protected]>
Reviewed-by: Devlin <[email protected]>
Commit-Queue: Sorin Jianu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#489528}diff --git a/components/component_updater/component_updater_service_unittest.cc b/components/component_updater/component_updater_service_unittest.cc
index 4389e14..5e033c0 100644
--- a/components/component_updater/component_updater_service_unittest.cc
+++ b/components/component_updater/component_updater_service_unittest.cc
@@ -126,10 +126,12 @@
private:
base::test::ScopedTaskEnvironment scoped_task_environment_;
base::RunLoop runloop_;
- base::Closure quit_closure_;
+ const base::Closure quit_closure_ = runloop_.QuitClosure();
- scoped_refptr<TestConfigurator> config_;
- scoped_refptr<MockUpdateClient> update_client_;
+ scoped_refptr<TestConfigurator> config_ =
+ base::MakeRefCounted<TestConfigurator>();
+ scoped_refptr<MockUpdateClient> update_client_ =
+ base::MakeRefCounted<MockUpdateClient>();
std::unique_ptr<ComponentUpdateService> component_updater_;
DISALLOW_COPY_AND_ASSIGN(ComponentUpdaterTest);
@@ -181,16 +183,7 @@
return base::MakeUnique<CrxUpdateService>(config, new MockUpdateClient());
}
-ComponentUpdaterTest::ComponentUpdaterTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
- quit_closure_ = runloop_.QuitClosure();
-
- config_ = base::MakeRefCounted<TestConfigurator>(
- base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()}),
- base::ThreadTaskRunnerHandle::Get());
-
- update_client_ = base::MakeRefCounted<MockUpdateClient>();
+ComponentUpdaterTest::ComponentUpdaterTest() {
EXPECT_CALL(update_client(), AddObserver(_)).Times(1);
component_updater_ =
base::MakeUnique<CrxUpdateService>(config_, update_client_);
