scheduler: Encapsulate TaskQueueManager inside SchedulerHelper

content/child/scheduler/scheduler_helper_unittest.cc

Index: content/child/scheduler/scheduler_helper_unittest.cc
diff --git a/content/child/scheduler/scheduler_helper_unittest.cc b/content/child/scheduler/scheduler_helper_unittest.cc
index 9d57e722cd185bf9c116de9da716b150293bf6a8..f5d97ef2599ff4194b3589a2dd89d0fec368b754 100644
--- a/content/child/scheduler/scheduler_helper_unittest.cc
+++ b/content/child/scheduler/scheduler_helper_unittest.cc
@@ -124,11 +124,6 @@ class SchedulerHelperForTest : public SchedulerHelper,
 
   ~SchedulerHelperForTest() override {}
 
-  using SchedulerHelper::CanExceedIdleDeadlineIfRequired;
-  using SchedulerHelper::EndIdlePeriod;
-  using SchedulerHelper::StartIdlePeriod;
-  using SchedulerHelper::EnableLongIdlePeriod;
-
   // SchedulerHelperDelegate implementation:
   MOCK_METHOD2(CanEnterLongIdlePeriod,
                bool(base::TimeTicks now,
@@ -239,6 +234,10 @@ class SchedulerHelperTest : public BaseSchedulerHelperTest {
 
   ~SchedulerHelperTest() override {}
 
+  TaskQueueManager* task_queue_manager() const {
+    return scheduler_helper_->task_queue_manager_.get();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(SchedulerHelperTest);
 };
@@ -457,8 +456,6 @@ TEST_F(SchedulerHelperTest, TestPostIdleTaskWakesAfterWakeupIdleTask) {
 
 TEST_F(SchedulerHelperTest, TestDelayedEndIdlePeriod) {
   mock_task_runner_->SetAutoAdvanceNowToPendingTasks(true);
-  TaskQueueManager* task_queue_manager =
-      scheduler_helper_->SchedulerTaskQueueManager();
 
   EXPECT_CALL(*scheduler_helper_, CanEnterLongIdlePeriod(_, _))
       .Times(2)
@@ -470,21 +467,19 @@ TEST_F(SchedulerHelperTest, TestDelayedEndIdlePeriod) {
   scheduler_helper_->EnableLongIdlePeriod();
 
   // Check there is a pending delayed task.
-  EXPECT_GT(
-      task_queue_manager->NextPendingDelayedTaskRunTime(), base::TimeTicks());
+  EXPECT_GT(task_queue_manager()->NextPendingDelayedTaskRunTime(),
+            base::TimeTicks());
 
   RunUntilIdle();
 
   // If the delayed task ran, it will an EnableLongIdlePeriod on the control
   // task after wake up queue.
-  EXPECT_FALSE(task_queue_manager->IsQueueEmpty(
+  EXPECT_FALSE(task_queue_manager()->IsQueueEmpty(
       SchedulerHelper::CONTROL_TASK_AFTER_WAKEUP_QUEUE));
 }
 
 TEST_F(SchedulerHelperTest, TestDelayedEndIdlePeriodCanceled) {
   mock_task_runner_->SetAutoAdvanceNowToPendingTasks(true);
-  TaskQueueManager* task_queue_manager =
-      scheduler_helper_->SchedulerTaskQueueManager();
 
   EXPECT_CALL(*scheduler_helper_, CanEnterLongIdlePeriod(_, _))
       .Times(1)
@@ -496,15 +491,15 @@ TEST_F(SchedulerHelperTest, TestDelayedEndIdlePeriodCanceled) {
   scheduler_helper_->EnableLongIdlePeriod();
 
   // Check there is a pending delayed task.
-  EXPECT_GT(
-      task_queue_manager->NextPendingDelayedTaskRunTime(), base::TimeTicks());
+  EXPECT_GT(task_queue_manager()->NextPendingDelayedTaskRunTime(),
+            base::TimeTicks());
 
   scheduler_helper_->EndIdlePeriod();
   RunUntilIdle();
 
   // If the delayed task didn't run, there will be nothing on the control task
   // after wake up queue.
-  EXPECT_TRUE(task_queue_manager->IsQueueEmpty(
+  EXPECT_TRUE(scheduler_helper_->IsQueueEmpty(
       SchedulerHelper::CONTROL_TASK_AFTER_WAKEUP_QUEUE));
 }