| Index: components/scheduler/renderer/idle_time_estimator_unittest.cc
|
| diff --git a/components/scheduler/renderer/idle_time_estimator_unittest.cc b/components/scheduler/renderer/idle_time_estimator_unittest.cc
|
| index 695be8092aa6001d3eaa28c25c26a2e2f7d3c69e..8ea986f56e9b5d5107aa92c5e0663616d0a7dbdf 100644
|
| --- a/components/scheduler/renderer/idle_time_estimator_unittest.cc
|
| +++ b/components/scheduler/renderer/idle_time_estimator_unittest.cc
|
| @@ -18,14 +18,13 @@ class IdleTimeEstimatorForTest : public IdleTimeEstimator {
|
| public:
|
| IdleTimeEstimatorForTest(
|
| const scoped_refptr<TaskQueue>& compositor_task_runner,
|
| - base::SimpleTestTickClock* clock,
|
| + base::TestTimeSource* test_time_source,
|
| int sample_count,
|
| double estimation_percentile)
|
| : IdleTimeEstimator(compositor_task_runner,
|
| + test_time_source,
|
| sample_count,
|
| - estimation_percentile) {
|
| - SetTimeSourceForTesting(make_scoped_ptr(new TestTimeSource(clock)));
|
| - }
|
| + estimation_percentile) {}
|
| };
|
|
|
| class IdleTimeEstimatorTest : public testing::Test {
|
| @@ -38,17 +37,18 @@ class IdleTimeEstimatorTest : public testing::Test {
|
| void SetUp() override {
|
| clock_.reset(new base::SimpleTestTickClock());
|
| clock_->Advance(base::TimeDelta::FromMicroseconds(5000));
|
| + test_time_source_.reset(new TestTimeSource(&clock_));
|
| 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())));
|
| manager_ = make_scoped_ptr(new TaskQueueManager(
|
| main_task_runner_, "test.scheduler", "test.scheduler",
|
| "test.scheduler.debug"));
|
| compositor_task_runner_ =
|
| manager_->NewTaskQueue(TaskQueue::Spec("compositor_tq"));
|
| - estimator_.reset(new IdleTimeEstimatorForTest(compositor_task_runner_,
|
| - clock_.get(), 10, 50));
|
| + estimator_.reset(new IdleTimeEstimatorForTest(
|
| + compositor_task_runner_, test_time_source_.get(), 10, 50));
|
| }
|
|
|
| void SimulateFrameWithOneCompositorTask(int compositor_time) {
|
| @@ -83,7 +83,8 @@ class IdleTimeEstimatorTest : public testing::Test {
|
| clock_->Advance(idle_time);
|
| }
|
|
|
| - scoped_ptr<base::SimpleTestTickClock> clock_;
|
| + base::SimpleTestTickClock clock_;
|
| + scoped_ptr<TestTimeSource> test_time_source_;
|
| scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
|
| scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner_;
|
| scoped_ptr<TaskQueueManager> manager_;
|
|
|