[Merge to 2883] Revert "[scheduler] Throttle background frames with 1% CPU limit"

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

Index: third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc
index beb4ac3a5fd276e7bcdc388d673c9713a0586b4c..5dc7d3a7e1e1f9744422f7e3bbf709315bea9fed 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler_unittest.cc
@@ -762,112 +762,5 @@ TEST_F(TaskQueueThrottlerTest, EnableAndDisableThrottling) {
                                      base::TimeDelta::FromMilliseconds(1000)));
 }
 
-TEST_F(TaskQueueThrottlerTest, DisabledTimeBudgetDoesNotAffectThrottledQueues) {
-  std::vector<base::TimeTicks> run_times;
-  LazyNow lazy_now(clock_.get());
-
-  TaskQueueThrottler::TimeBudgetPool* pool =
-      task_queue_throttler_->CreateTimeBudgetPool("pool");
-  pool->SetTimeBudget(lazy_now.Now(), 0.1);
-  pool->DisableThrottling(&lazy_now);
-
-  pool->AddQueue(lazy_now.Now(), timer_queue_.get());
-
-  task_queue_throttler_->IncreaseThrottleRefCount(timer_queue_.get());
-
-  timer_queue_->PostDelayedTask(
-      FROM_HERE, base::Bind(&ExpensiveTestTask, &run_times, clock_.get()),
-      base::TimeDelta::FromMilliseconds(100));
-  timer_queue_->PostDelayedTask(
-      FROM_HERE, base::Bind(&ExpensiveTestTask, &run_times, clock_.get()),
-      base::TimeDelta::FromMilliseconds(100));
-
-  mock_task_runner_->RunUntilIdle();
-
-  EXPECT_THAT(
-      run_times,
-      ElementsAre(base::TimeTicks() + base::TimeDelta::FromMilliseconds(1000),
-                  base::TimeTicks() + base::TimeDelta::FromMilliseconds(1250)));
-}
-
-TEST_F(TaskQueueThrottlerTest,
-       TimeBudgetThrottlingDoesNotAffectUnthrottledQueues) {
-  std::vector<base::TimeTicks> run_times;
-
-  TaskQueueThrottler::TimeBudgetPool* pool =
-      task_queue_throttler_->CreateTimeBudgetPool("pool");
-  pool->SetTimeBudget(base::TimeTicks(), 0.1);
-
-  LazyNow lazy_now(clock_.get());
-  pool->DisableThrottling(&lazy_now);
-
-  pool->AddQueue(clock_->NowTicks(), timer_queue_.get());
-
-  timer_queue_->PostDelayedTask(
-      FROM_HERE, base::Bind(&ExpensiveTestTask, &run_times, clock_.get()),
-      base::TimeDelta::FromMilliseconds(100));
-  timer_queue_->PostDelayedTask(
-      FROM_HERE, base::Bind(&ExpensiveTestTask, &run_times, clock_.get()),
-      base::TimeDelta::FromMilliseconds(100));
-
-  mock_task_runner_->RunUntilIdle();
-
-  EXPECT_THAT(
-      run_times,
-      ElementsAre(base::TimeTicks() + base::TimeDelta::FromMilliseconds(105),
-                  base::TimeTicks() + base::TimeDelta::FromMilliseconds(355)));
-}
-
-TEST_F(TaskQueueThrottlerTest,
-       TimeBudgetThrottlingDoesNotConflictWithDisablingThrottling) {
-  std::vector<base::TimeTicks> run_times;
-
-  TaskQueueThrottler::TimeBudgetPool* pool =
-      task_queue_throttler_->CreateTimeBudgetPool("pool");
-  pool->SetTimeBudget(base::TimeTicks(), 0.1);
-
-  pool->AddQueue(clock_->NowTicks(), timer_queue_.get());
-
-  timer_queue_->PostDelayedTask(
-      FROM_HERE, base::Bind(&ExpensiveTestTask, &run_times, clock_.get()),
-      base::TimeDelta::FromMilliseconds(100));
-  timer_queue_->PostDelayedTask(
-      FROM_HERE, base::Bind(&ExpensiveTestTask, &run_times, clock_.get()),
-      base::TimeDelta::FromMilliseconds(100));
-
-  task_queue_throttler_->DisableThrottling();
-
-  mock_task_runner_->RunUntilIdle();
-
-  EXPECT_THAT(
-      run_times,
-      ElementsAre(base::TimeTicks() + base::TimeDelta::FromMilliseconds(105),
-                  base::TimeTicks() + base::TimeDelta::FromMilliseconds(355)));
-}
-
-TEST_F(TaskQueueThrottlerTest,
-       TimeBudgetThrottlingDoesNotConflictWithSetQueueEnabled) {
-  timer_queue_->SetQueueEnabled(false);
-
-  std::vector<base::TimeTicks> run_times;
-
-  TaskQueueThrottler::TimeBudgetPool* pool =
-      task_queue_throttler_->CreateTimeBudgetPool("pool");
-  pool->SetTimeBudget(clock_->NowTicks(), 0.1);
-
-  pool->AddQueue(clock_->NowTicks(), timer_queue_.get());
-
-  task_queue_throttler_->SetQueueEnabled(timer_queue_.get(), true);
-
-  timer_queue_->PostDelayedTask(
-      FROM_HERE, base::Bind(&ExpensiveTestTask, &run_times, clock_.get()),
-      base::TimeDelta::FromMilliseconds(100));
-
-  mock_task_runner_->RunUntilIdle();
-
-  EXPECT_THAT(run_times, ElementsAre(base::TimeTicks() +
-                                     base::TimeDelta::FromMilliseconds(105)));
-}
-
 }  // namespace scheduler
 }  // namespace blink