| Index: components/scheduler/child/scheduler_helper_unittest.cc
|
| diff --git a/components/scheduler/child/scheduler_helper_unittest.cc b/components/scheduler/child/scheduler_helper_unittest.cc
|
| index 1a1df9102267d2608a52821f84cc7c27d123c81d..236fedef3c21c5f199b9975997b97b0eb63e0b71 100644
|
| --- a/components/scheduler/child/scheduler_helper_unittest.cc
|
| +++ b/components/scheduler/child/scheduler_helper_unittest.cc
|
| @@ -5,8 +5,8 @@
|
| #include "components/scheduler/child/scheduler_helper.h"
|
|
|
| #include "base/callback.h"
|
| +#include "base/test/simple_test_tick_clock.h"
|
| #include "cc/test/ordered_simple_task_runner.h"
|
| -#include "cc/test/test_now_source.h"
|
| #include "components/scheduler/child/nestable_task_runner_for_test.h"
|
| #include "components/scheduler/child/scheduler_message_loop_delegate.h"
|
| #include "components/scheduler/child/test_time_source.h"
|
| @@ -43,21 +43,20 @@ void AppendToVectorReentrantTask(base::SingleThreadTaskRunner* task_runner,
|
|
|
| class SchedulerHelperTest : public testing::Test {
|
| public:
|
| - SchedulerHelperTest()
|
| - : clock_(cc::TestNowSource::Create(5000)),
|
| - mock_task_runner_(new cc::OrderedSimpleTaskRunner(clock_, false)),
|
| - nestable_task_runner_(
|
| - NestableTaskRunnerForTest::Create(mock_task_runner_)),
|
| - scheduler_helper_(
|
| - new SchedulerHelper(nestable_task_runner_,
|
| - "test.scheduler",
|
| - TRACE_DISABLED_BY_DEFAULT("test.scheduler"),
|
| - SchedulerHelper::TASK_QUEUE_COUNT)),
|
| - default_task_runner_(scheduler_helper_->DefaultTaskRunner()) {
|
| + SchedulerHelperTest() : clock_(new base::SimpleTestTickClock()) {
|
| + clock_->Advance(base::TimeDelta::FromInternalValue(5000));
|
| + mock_task_runner_ = new cc::OrderedSimpleTaskRunner(clock_.get(), false);
|
| + nestable_task_runner_ =
|
| + NestableTaskRunnerForTest::Create(mock_task_runner_);
|
| + scheduler_helper_ = make_scoped_ptr(
|
| + new SchedulerHelper(nestable_task_runner_, "test.scheduler",
|
| + TRACE_DISABLED_BY_DEFAULT("test.scheduler"),
|
| + SchedulerHelper::TASK_QUEUE_COUNT));
|
| + default_task_runner_ = scheduler_helper_->DefaultTaskRunner();
|
| scheduler_helper_->SetTimeSourceForTesting(
|
| - make_scoped_ptr(new TestTimeSource(clock_)));
|
| + make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| scheduler_helper_->GetTaskQueueManagerForTesting()->SetTimeSourceForTesting(
|
| - make_scoped_ptr(new TestTimeSource(clock_)));
|
| + make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| }
|
|
|
| ~SchedulerHelperTest() override {}
|
| @@ -88,7 +87,7 @@ class SchedulerHelperTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - scoped_refptr<cc::TestNowSource> clock_;
|
| + scoped_ptr<base::SimpleTestTickClock> clock_;
|
| scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
|
|
|
| scoped_refptr<NestableSingleThreadTaskRunner> nestable_task_runner_;
|
|
|