| Index: components/scheduler/child/idle_helper_unittest.cc
|
| diff --git a/components/scheduler/child/idle_helper_unittest.cc b/components/scheduler/child/idle_helper_unittest.cc
|
| index 20ae1b5c0937dadc371dd1f0f498558d83102a86..38b5e29ad9a701644ff6a3abd19020423165bac9 100644
|
| --- a/components/scheduler/child/idle_helper_unittest.cc
|
| +++ b/components/scheduler/child/idle_helper_unittest.cc
|
| @@ -7,9 +7,9 @@
|
| #include "base/callback.h"
|
| #include "base/test/simple_test_tick_clock.h"
|
| #include "cc/test/ordered_simple_task_runner.h"
|
| -#include "components/scheduler/child/nestable_task_runner_for_test.h"
|
| #include "components/scheduler/child/scheduler_helper.h"
|
| -#include "components/scheduler/child/scheduler_message_loop_delegate.h"
|
| +#include "components/scheduler/child/scheduler_task_runner_delegate_for_test.h"
|
| +#include "components/scheduler/child/scheduler_task_runner_delegate_impl.h"
|
| #include "components/scheduler/child/task_queue_manager.h"
|
| #include "components/scheduler/child/test_time_source.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -125,14 +125,13 @@ void EndIdlePeriodIdleTask(IdleHelper* idle_helper, base::TimeTicks deadline) {
|
| idle_helper->EndIdlePeriod();
|
| }
|
|
|
| -scoped_refptr<NestableSingleThreadTaskRunner>
|
| -CreateNestableSingleThreadTaskRunner(
|
| +scoped_refptr<SchedulerTaskRunnerDelegate> CreateTaskRunnerDelegate(
|
| base::MessageLoop* message_loop,
|
| scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner) {
|
| if (message_loop)
|
| - return SchedulerMessageLoopDelegate::Create(message_loop);
|
| + return SchedulerTaskRunnerDelegateImpl::Create(message_loop);
|
|
|
| - return NestableTaskRunnerForTest::Create(mock_task_runner);
|
| + return SchedulerTaskRunnerDelegateForTest::Create(mock_task_runner);
|
| }
|
|
|
| }; // namespace
|
| @@ -173,11 +172,10 @@ class BaseIdleHelperTest : public testing::Test {
|
| ? nullptr
|
| : new cc::OrderedSimpleTaskRunner(clock_.get(), false)),
|
| message_loop_(message_loop),
|
| - nestable_task_runner_(
|
| - CreateNestableSingleThreadTaskRunner(message_loop,
|
| - mock_task_runner_)),
|
| + main_task_runner_(
|
| + CreateTaskRunnerDelegate(message_loop, mock_task_runner_)),
|
| scheduler_helper_(
|
| - new SchedulerHelper(nestable_task_runner_,
|
| + new SchedulerHelper(main_task_runner_,
|
| "test.idle",
|
| TRACE_DISABLED_BY_DEFAULT("test.idle"),
|
| TRACE_DISABLED_BY_DEFAULT("test.idle.debug"),
|
| @@ -277,7 +275,7 @@ class BaseIdleHelperTest : public testing::Test {
|
| scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_;
|
| scoped_ptr<base::MessageLoop> message_loop_;
|
|
|
| - scoped_refptr<NestableSingleThreadTaskRunner> nestable_task_runner_;
|
| + scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner_;
|
| scoped_ptr<SchedulerHelper> scheduler_helper_;
|
| scoped_ptr<IdleHelperForTest> idle_helper_;
|
| scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
|
|
|