| Index: components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| diff --git a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc b/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| index 7e339c2169f1505e38b342d1cd322691becd01f4..9a5c1e3d3e41366ee5f62a37196db41bdbad945b 100644
|
| --- a/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| +++ b/components/scheduler/renderer/renderer_scheduler_impl_unittest.cc
|
| @@ -179,7 +179,9 @@ class RendererSchedulerImplForTest : public RendererSchedulerImpl {
|
|
|
| RendererSchedulerImplForTest(
|
| scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner)
|
| - : RendererSchedulerImpl(main_task_runner), update_policy_count_(0) {}
|
| + : RendererSchedulerImpl(main_task_runner,
|
| + RendererSchedulerImpl::TimeSource::NORMAL),
|
| + update_policy_count_(0) {}
|
|
|
| void UpdatePolicyLocked(UpdateType update_type) override {
|
| update_policy_count_++;
|
| @@ -236,13 +238,14 @@ class RendererSchedulerImplTest : public testing::Test {
|
|
|
| void SetUp() override {
|
| if (message_loop_) {
|
| - main_task_runner_ =
|
| - SchedulerTaskRunnerDelegateImpl::Create(message_loop_.get());
|
| + main_task_runner_ = SchedulerTaskRunnerDelegateImpl::Create(
|
| + message_loop_.get(),
|
| + make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| } else {
|
| mock_task_runner_ = make_scoped_refptr(
|
| new cc::OrderedSimpleTaskRunner(clock_.get(), false));
|
| - main_task_runner_ =
|
| - SchedulerTaskRunnerDelegateForTest::Create(mock_task_runner_);
|
| + main_task_runner_ = SchedulerTaskRunnerDelegateForTest::Create(
|
| + mock_task_runner_, make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| }
|
| Initialize(
|
| make_scoped_ptr(new RendererSchedulerImplForTest(main_task_runner_)));
|
| @@ -255,19 +258,6 @@ class RendererSchedulerImplTest : public testing::Test {
|
| loading_task_runner_ = scheduler_->LoadingTaskRunner();
|
| idle_task_runner_ = scheduler_->IdleTaskRunner();
|
| timer_task_runner_ = scheduler_->TimerTaskRunner();
|
| - scheduler_->GetSchedulerHelperForTesting()->SetTimeSourceForTesting(
|
| - make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| - scheduler_->GetSchedulerHelperForTesting()
|
| - ->GetTaskQueueManagerForTesting()
|
| - ->SetTimeSourceForTesting(
|
| - make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| - scheduler_->GetLoadingTaskCostEstimatorForTesting()
|
| - ->SetTimeSourceForTesting(
|
| - make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| - scheduler_->GetTimerTaskCostEstimatorForTesting()->SetTimeSourceForTesting(
|
| - make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| - scheduler_->GetIdleTimeEstimatorForTesting()->SetTimeSourceForTesting(
|
| - make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| }
|
|
|
| void TearDown() override {
|
| @@ -1368,8 +1358,8 @@ class RendererSchedulerImplWithMockSchedulerTest
|
| void SetUp() override {
|
| mock_task_runner_ = make_scoped_refptr(
|
| new cc::OrderedSimpleTaskRunner(clock_.get(), false));
|
| - main_task_runner_ =
|
| - SchedulerTaskRunnerDelegateForTest::Create(mock_task_runner_);
|
| + main_task_runner_ = SchedulerTaskRunnerDelegateForTest::Create(
|
| + mock_task_runner_, make_scoped_ptr(new TestTimeSource(clock_.get())));
|
| mock_scheduler_ = new RendererSchedulerImplForTest(main_task_runner_);
|
| Initialize(make_scoped_ptr(mock_scheduler_));
|
| }
|
|
|