Index: components/scheduler/child/worker_scheduler_impl_unittest.cc |
diff --git a/components/scheduler/child/worker_scheduler_impl_unittest.cc b/components/scheduler/child/worker_scheduler_impl_unittest.cc |
index 451d86197ce7e8fce8f6f4ff1c5d3bcae921f40f..9b17b157669d8e698f8229658f770e12c2b9e352 100644 |
--- a/components/scheduler/child/worker_scheduler_impl_unittest.cc |
+++ b/components/scheduler/child/worker_scheduler_impl_unittest.cc |
@@ -8,8 +8,7 @@ |
#include "base/strings/stringprintf.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_message_loop_delegate.h" |
+#include "components/scheduler/child/scheduler_task_runner_delegate_for_test.h" |
#include "components/scheduler/child/test_time_source.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -54,7 +53,7 @@ void TimelineIdleTestTask(std::vector<std::string>* timeline, |
class WorkerSchedulerImplForTest : public WorkerSchedulerImpl { |
public: |
WorkerSchedulerImplForTest( |
- scoped_refptr<NestableSingleThreadTaskRunner> main_task_runner, |
+ scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner, |
base::SimpleTestTickClock* clock_) |
: WorkerSchedulerImpl(main_task_runner), |
clock_(clock_), |
@@ -93,10 +92,10 @@ class WorkerSchedulerImplTest : public testing::Test { |
WorkerSchedulerImplTest() |
: clock_(new base::SimpleTestTickClock()), |
mock_task_runner_(new cc::OrderedSimpleTaskRunner(clock_.get(), true)), |
- nestable_task_runner_( |
- NestableTaskRunnerForTest::Create(mock_task_runner_)), |
- scheduler_(new WorkerSchedulerImplForTest(nestable_task_runner_, |
- clock_.get())), |
+ main_task_runner_( |
+ SchedulerTaskRunnerDelegateForTest::Create(mock_task_runner_)), |
+ scheduler_( |
+ new WorkerSchedulerImplForTest(main_task_runner_, clock_.get())), |
timeline_(nullptr) { |
clock_->Advance(base::TimeDelta::FromMicroseconds(5000)); |
scheduler_->GetSchedulerHelperForTesting()->SetTimeSourceForTesting( |
@@ -176,7 +175,7 @@ class WorkerSchedulerImplTest : public testing::Test { |
// Only one of mock_task_runner_ or message_loop_ will be set. |
scoped_refptr<cc::OrderedSimpleTaskRunner> mock_task_runner_; |
- scoped_refptr<NestableSingleThreadTaskRunner> nestable_task_runner_; |
+ scoped_refptr<SchedulerTaskRunnerDelegate> main_task_runner_; |
scoped_ptr<WorkerSchedulerImplForTest> scheduler_; |
scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_; |
scoped_refptr<SingleThreadIdleTaskRunner> idle_task_runner_; |