| Index: content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc
|
| diff --git a/content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc b/content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc
|
| index 191a2710480b52ab4fcead0da754ab0bcd69b4e7..756a4c3c516c7e18e8c0ddcc0f853cee3f662169 100644
|
| --- a/content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc
|
| +++ b/content/renderer/scheduler/webthread_impl_for_renderer_scheduler_unittest.cc
|
| @@ -5,8 +5,8 @@
|
| #include "content/renderer/scheduler/webthread_impl_for_renderer_scheduler.h"
|
|
|
| #include "base/run_loop.h"
|
| -#include "content/child/scheduler/scheduler_message_loop_delegate.h"
|
| -#include "content/renderer/scheduler/renderer_scheduler_impl.h"
|
| +#include "components/scheduler/child/scheduler_message_loop_delegate.h"
|
| +#include "components/scheduler/renderer/renderer_scheduler_impl.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/WebKit/public/platform/WebTraceLocation.h"
|
| @@ -31,14 +31,16 @@ class MockTaskObserver : public blink::WebThread::TaskObserver {
|
| class WebThreadImplForRendererSchedulerTest : public testing::Test {
|
| public:
|
| WebThreadImplForRendererSchedulerTest()
|
| - : scheduler_(SchedulerMessageLoopDelegate::Create(&message_loop_)),
|
| + : scheduler_(
|
| + scheduler::SchedulerMessageLoopDelegate::Create(&message_loop_)),
|
| default_task_runner_(scheduler_.DefaultTaskRunner()),
|
| thread_(&scheduler_) {}
|
|
|
| ~WebThreadImplForRendererSchedulerTest() override {}
|
|
|
| void SetWorkBatchSizeForTesting(size_t work_batch_size) {
|
| - scheduler_.SetWorkBatchSizeForTesting(work_batch_size);
|
| + scheduler_.GetSchedulerHelperForTesting()->SetWorkBatchSizeForTesting(
|
| + work_batch_size);
|
| }
|
|
|
| protected:
|
| @@ -49,7 +51,7 @@ class WebThreadImplForRendererSchedulerTest : public testing::Test {
|
| }
|
|
|
| base::MessageLoop message_loop_;
|
| - RendererSchedulerImpl scheduler_;
|
| + scheduler::RendererSchedulerImpl scheduler_;
|
| scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
|
| WebThreadImplForRendererScheduler thread_;
|
|
|
| @@ -80,7 +82,7 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithOneTask) {
|
| thread_.addTaskObserver(&observer);
|
| scoped_ptr<MockTask> task(new MockTask());
|
|
|
| - scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
|
| + SetWorkBatchSizeForTesting(kWorkBatchSize);
|
| {
|
| testing::InSequence sequence;
|
| EXPECT_CALL(observer, willProcessTask());
|
| @@ -101,7 +103,7 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithTwoTasks) {
|
| scoped_ptr<MockTask> task1(new MockTask());
|
| scoped_ptr<MockTask> task2(new MockTask());
|
|
|
| - scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
|
| + SetWorkBatchSizeForTesting(kWorkBatchSize);
|
| {
|
| testing::InSequence sequence;
|
| EXPECT_CALL(observer, willProcessTask());
|
| @@ -128,7 +130,7 @@ TEST_F(WebThreadImplForRendererSchedulerTest, TestWorkBatchWithThreeTasks) {
|
| scoped_ptr<MockTask> task2(new MockTask());
|
| scoped_ptr<MockTask> task3(new MockTask());
|
|
|
| - scheduler_.SetWorkBatchSizeForTesting(kWorkBatchSize);
|
| + SetWorkBatchSizeForTesting(kWorkBatchSize);
|
| {
|
| testing::InSequence sequence;
|
| EXPECT_CALL(observer, willProcessTask());
|
|
|