Revert of Schedule bitmap animation timers on the compositor task runner.

third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc

Index: third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
index 1f57e19cafdbefd744bfdb217cdd84a4f9c72eea..19b59de70c8556d7f036ccbc357a1a887fa77e7e 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/renderer_scheduler_impl_unittest.cc
@@ -569,17 +569,6 @@ class RendererSchedulerImplTest : public testing::Test {
     scheduler_->seqlock_queueing_time_estimator_.seqlock.WriteEnd();
   }
 
-  void RunSlowCompositorTask() {
-    // Run a long compositor task so that compositor tasks appear to be running
-    // slow and thus compositor tasks will not be prioritized.
-    compositor_task_runner_->PostTask(
-        FROM_HERE,
-        base::Bind(&RendererSchedulerImplTest::SimulateMainThreadCompositorTask,
-                   base::Unretained(this),
-                   base::TimeDelta::FromMilliseconds(1000)));
-    RunUntilIdle();
-  }
-
   // Helper for posting several tasks of specific types. |task_descriptor| is a
   // string with space delimited task identifiers. The first letter of each
   // task identifier specifies the task type:
@@ -848,21 +837,6 @@ TEST_F(RendererSchedulerImplTest, TestDefaultPolicy) {
   EnableIdleTasks();
   RunUntilIdle();
   EXPECT_THAT(run_order,
-              testing::ElementsAre(std::string("C1"), std::string("C2"),
-                                   std::string("L1"), std::string("D1"),
-                                   std::string("D2"), std::string("I1")));
-  EXPECT_EQ(RendererSchedulerImpl::UseCase::NONE, CurrentUseCase());
-}
-
-TEST_F(RendererSchedulerImplTest, TestDefaultPolicyWithSlowCompositor) {
-  RunSlowCompositorTask();
-
-  std::vector<std::string> run_order;
-  PostTestTasks(&run_order, "L1 I1 D1 C1 D2 C2");
-
-  EnableIdleTasks();
-  RunUntilIdle();
-  EXPECT_THAT(run_order,
               testing::ElementsAre(std::string("L1"), std::string("D1"),
                                    std::string("C1"), std::string("D2"),
                                    std::string("C2"), std::string("I1")));
@@ -1284,8 +1258,6 @@ TEST_F(RendererSchedulerImplTest, DISABLED_LoadingUseCase) {
 
 TEST_F(RendererSchedulerImplTest,
        EventConsumedOnCompositorThread_IgnoresMouseMove_WhenMouseUp) {
-  RunSlowCompositorTask();
-
   std::vector<std::string> run_order;
   PostTestTasks(&run_order, "I1 D1 C1 D2 C2");
 
@@ -1304,8 +1276,6 @@ TEST_F(RendererSchedulerImplTest,
 
 TEST_F(RendererSchedulerImplTest,
        EventForwardedToMainThread_IgnoresMouseMove_WhenMouseUp) {
-  RunSlowCompositorTask();
-
   std::vector<std::string> run_order;
   PostTestTasks(&run_order, "I1 D1 C1 D2 C2");
 
@@ -1526,8 +1496,6 @@ TEST_F(
 
 TEST_F(RendererSchedulerImplTest,
        EventConsumedOnCompositorThread_IgnoresKeyboardEvents) {
-  RunSlowCompositorTask();
-
   std::vector<std::string> run_order;
   PostTestTasks(&run_order, "I1 D1 C1 D2 C2");
 
@@ -1546,8 +1514,6 @@ TEST_F(RendererSchedulerImplTest,
 
 TEST_F(RendererSchedulerImplTest,
        EventForwardedToMainThread_IgnoresKeyboardEvents) {
-  RunSlowCompositorTask();
-
   std::vector<std::string> run_order;
   PostTestTasks(&run_order, "I1 D1 C1 D2 C2");
 
@@ -2417,7 +2383,7 @@ TEST_F(RendererSchedulerImplTest, SuspendRenderer) {
   EnableIdleTasks();
   RunUntilIdle();
   EXPECT_THAT(run_order,
-              testing::ElementsAre(std::string("C1"), std::string("D1"),
+              testing::ElementsAre(std::string("D1"), std::string("C1"),
                                    std::string("I1")));
 
   // The rest queued tasks fire when the tab goes foregrounded.
@@ -2449,7 +2415,7 @@ TEST_F(RendererSchedulerImplTest, ResumeRenderer) {
   EnableIdleTasks();
   RunUntilIdle();
   EXPECT_THAT(run_order,
-              testing::ElementsAre(std::string("C1"), std::string("D1"),
+              testing::ElementsAre(std::string("D1"), std::string("C1"),
                                    std::string("I1")));
 
   // The rest queued tasks fire when the renderer is resumed.
@@ -2467,7 +2433,7 @@ TEST_F(RendererSchedulerImplTest, ResumeRenderer) {
   EnableIdleTasks();
   RunUntilIdle();
   EXPECT_THAT(run_order,
-              testing::ElementsAre(std::string("C2"), std::string("D2"),
+              testing::ElementsAre(std::string("D2"), std::string("C2"),
                                    std::string("I2")));
 
   // The rest queued tasks fire when the renderer is resumed.