Introduce a SchedulerHelper in content/child/scheduler

content/child/scheduler/prioritizing_task_queue_selector_unittest.cc

Index: content/child/scheduler/prioritizing_task_queue_selector_unittest.cc
diff --git a/content/renderer/scheduler/renderer_task_queue_selector_unittest.cc b/content/child/scheduler/prioritizing_task_queue_selector_unittest.cc
similarity index 71%
rename from content/renderer/scheduler/renderer_task_queue_selector_unittest.cc
rename to content/child/scheduler/prioritizing_task_queue_selector_unittest.cc
index 1112beb6b89a6a4f8c7093ec608145877e452e67..db1d5037720cd064e69218b9b9d5fb159518049f 100644
--- a/content/renderer/scheduler/renderer_task_queue_selector_unittest.cc
+++ b/content/child/scheduler/prioritizing_task_queue_selector_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/renderer/scheduler/renderer_task_queue_selector.h"
+#include "content/child/scheduler/prioritizing_task_queue_selector.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ -13,12 +13,12 @@
 
 namespace content {
 
-class RendererTaskQueueSelectorTest : public testing::Test {
+class PrioritizingTaskQueueSelectorTest : public testing::Test {
  public:
-  RendererTaskQueueSelectorTest()
+  PrioritizingTaskQueueSelectorTest()
       : test_closure_(
-            base::Bind(&RendererTaskQueueSelectorTest::TestFunction)) {}
-  ~RendererTaskQueueSelectorTest() override {}
+            base::Bind(&PrioritizingTaskQueueSelectorTest::TestFunction)) {}
+  ~PrioritizingTaskQueueSelectorTest() override {}
 
   std::vector<base::PendingTask> GetTasks(int count) {
     std::vector<base::PendingTask> tasks;
@@ -64,47 +64,48 @@ class RendererTaskQueueSelectorTest : public testing::Test {
 
   const size_t kTaskQueueCount = 5;
   base::Closure test_closure_;
-  RendererTaskQueueSelector selector_;
+  PrioritizingTaskQueueSelector selector_;
   ScopedVector<base::TaskQueue> task_queues_;
 };
 
-TEST_F(RendererTaskQueueSelectorTest, TestDefaultPriority) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestDefaultPriority) {
   std::vector<base::PendingTask> tasks = GetTasks(5);
   size_t queue_order[] = {4, 3, 2, 1, 0};
   PushTasks(tasks, queue_order);
   EXPECT_THAT(PopTasks(), testing::ElementsAre(4, 3, 2, 1, 0));
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestHighPriority) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestHighPriority) {
   std::vector<base::PendingTask> tasks = GetTasks(5);
   size_t queue_order[] = {0, 1, 2, 3, 4};
   PushTasks(tasks, queue_order);
-  selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
+  selector_.SetQueuePriority(2, PrioritizingTaskQueueSelector::HIGH_PRIORITY);
   EXPECT_THAT(PopTasks(), testing::ElementsAre(2, 0, 1, 3, 4));
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestBestEffortPriority) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestBestEffortPriority) {
   std::vector<base::PendingTask> tasks = GetTasks(5);
   size_t queue_order[] = {0, 1, 2, 3, 4};
   PushTasks(tasks, queue_order);
-  selector_.SetQueuePriority(0,
-                             RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
-  selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
+  selector_.SetQueuePriority(
+      0, PrioritizingTaskQueueSelector::BEST_EFFORT_PRIORITY);
+  selector_.SetQueuePriority(2, PrioritizingTaskQueueSelector::HIGH_PRIORITY);
   EXPECT_THAT(PopTasks(), testing::ElementsAre(2, 1, 3, 4, 0));
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestControlPriority) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestControlPriority) {
   std::vector<base::PendingTask> tasks = GetTasks(5);
   size_t queue_order[] = {0, 1, 2, 3, 4};
   PushTasks(tasks, queue_order);
-  selector_.SetQueuePriority(4, RendererTaskQueueSelector::CONTROL_PRIORITY);
+  selector_.SetQueuePriority(4,
+                             PrioritizingTaskQueueSelector::CONTROL_PRIORITY);
   EXPECT_TRUE(selector_.IsQueueEnabled(4));
-  selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
+  selector_.SetQueuePriority(2, PrioritizingTaskQueueSelector::HIGH_PRIORITY);
   EXPECT_TRUE(selector_.IsQueueEnabled(2));
   EXPECT_THAT(PopTasks(), testing::ElementsAre(4, 2, 0, 1, 3));
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestDisableEnable) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestDisableEnable) {
   std::vector<base::PendingTask> tasks = GetTasks(5);
   size_t queue_order[] = {0, 1, 2, 3, 4};
   PushTasks(tasks, queue_order);
@@ -113,13 +114,13 @@ TEST_F(RendererTaskQueueSelectorTest, TestDisableEnable) {
   selector_.DisableQueue(4);
   EXPECT_FALSE(selector_.IsQueueEnabled(4));
   EXPECT_THAT(PopTasks(), testing::ElementsAre(0, 1, 3));
-  selector_.EnableQueue(2, RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
+  selector_.EnableQueue(2, PrioritizingTaskQueueSelector::BEST_EFFORT_PRIORITY);
   EXPECT_THAT(PopTasks(), testing::ElementsAre(2));
-  selector_.EnableQueue(4, RendererTaskQueueSelector::NORMAL_PRIORITY);
+  selector_.EnableQueue(4, PrioritizingTaskQueueSelector::NORMAL_PRIORITY);
   EXPECT_THAT(PopTasks(), testing::ElementsAre(4));
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestEmptyQueues) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestEmptyQueues) {
   size_t chosen_queue_index = 0;
   EXPECT_FALSE(selector_.SelectWorkQueueToService(&chosen_queue_index));
 
@@ -132,7 +133,7 @@ TEST_F(RendererTaskQueueSelectorTest, TestEmptyQueues) {
   EXPECT_FALSE(selector_.SelectWorkQueueToService(&chosen_queue_index));
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestDelay) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestDelay) {
   std::vector<base::PendingTask> tasks = GetTasks(5);
   tasks[0].delayed_run_time =
       base::TimeTicks() + base::TimeDelta::FromMilliseconds(200);
@@ -143,14 +144,15 @@ TEST_F(RendererTaskQueueSelectorTest, TestDelay) {
   EXPECT_THAT(PopTasks(), testing::ElementsAre(1, 2, 4, 3, 0));
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestControlStarvesOthers) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestControlStarvesOthers) {
   std::vector<base::PendingTask> tasks = GetTasks(4);
   size_t queue_order[] = {0, 1, 2, 3};
   PushTasks(tasks, queue_order);
-  selector_.SetQueuePriority(3, RendererTaskQueueSelector::CONTROL_PRIORITY);
-  selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
-  selector_.SetQueuePriority(1,
-                             RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
+  selector_.SetQueuePriority(3,
+                             PrioritizingTaskQueueSelector::CONTROL_PRIORITY);
+  selector_.SetQueuePriority(2, PrioritizingTaskQueueSelector::HIGH_PRIORITY);
+  selector_.SetQueuePriority(
+      1, PrioritizingTaskQueueSelector::BEST_EFFORT_PRIORITY);
   for (int i = 0; i < 100; i++) {
     size_t chosen_queue_index = 0;
     EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
@@ -159,13 +161,13 @@ TEST_F(RendererTaskQueueSelectorTest, TestControlStarvesOthers) {
   }
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestHighPriorityDoesNotStarveNormal) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestHighPriorityDoesNotStarveNormal) {
   std::vector<base::PendingTask> tasks = GetTasks(3);
   size_t queue_order[] = {0, 1, 2};
   PushTasks(tasks, queue_order);
-  selector_.SetQueuePriority(2, RendererTaskQueueSelector::HIGH_PRIORITY);
-  selector_.SetQueuePriority(1,
-                             RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
+  selector_.SetQueuePriority(2, PrioritizingTaskQueueSelector::HIGH_PRIORITY);
+  selector_.SetQueuePriority(
+      1, PrioritizingTaskQueueSelector::BEST_EFFORT_PRIORITY);
   size_t counts[] = {0, 0, 0};
   for (int i = 0; i < 100; i++) {
     size_t chosen_queue_index = 0;
@@ -178,26 +180,27 @@ TEST_F(RendererTaskQueueSelectorTest, TestHighPriorityDoesNotStarveNormal) {
   EXPECT_EQ(0ul, counts[1]);        // Check best effort is starved.
 }
 
-TEST_F(RendererTaskQueueSelectorTest, TestBestEffortGetsStarved) {
+TEST_F(PrioritizingTaskQueueSelectorTest, TestBestEffortGetsStarved) {
   std::vector<base::PendingTask> tasks = GetTasks(2);
   size_t queue_order[] = {0, 1};
   PushTasks(tasks, queue_order);
-  selector_.SetQueuePriority(0,
-                             RendererTaskQueueSelector::BEST_EFFORT_PRIORITY);
-  selector_.SetQueuePriority(1, RendererTaskQueueSelector::NORMAL_PRIORITY);
+  selector_.SetQueuePriority(
+      0, PrioritizingTaskQueueSelector::BEST_EFFORT_PRIORITY);
+  selector_.SetQueuePriority(1, PrioritizingTaskQueueSelector::NORMAL_PRIORITY);
   size_t chosen_queue_index = 0;
   for (int i = 0; i < 100; i++) {
     EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
     EXPECT_EQ(1ul, chosen_queue_index);
     // Don't remove task from queue to simulate all queues still being full.
   }
-  selector_.SetQueuePriority(1, RendererTaskQueueSelector::HIGH_PRIORITY);
+  selector_.SetQueuePriority(1, PrioritizingTaskQueueSelector::HIGH_PRIORITY);
   for (int i = 0; i < 100; i++) {
     EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
     EXPECT_EQ(1ul, chosen_queue_index);
     // Don't remove task from queue to simulate all queues still being full.
   }
-  selector_.SetQueuePriority(1, RendererTaskQueueSelector::CONTROL_PRIORITY);
+  selector_.SetQueuePriority(1,
+                             PrioritizingTaskQueueSelector::CONTROL_PRIORITY);
   for (int i = 0; i < 100; i++) {
     EXPECT_TRUE(selector_.SelectWorkQueueToService(&chosen_queue_index));
     EXPECT_EQ(1ul, chosen_queue_index);