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

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

Index: third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
diff --git a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
index a050524cd905ae662c6533c1a76274a7a7ec98a6..fc1f553f97207b7c07470748e1a70543d339c78b 100644
--- a/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
+++ b/third_party/WebKit/Source/platform/scheduler/renderer/task_queue_throttler.cc
@@ -87,16 +87,13 @@ void TaskQueueThrottler::TimeBudgetPool::SetTimeBudget(base::TimeTicks now,
 
 void TaskQueueThrottler::TimeBudgetPool::AddQueue(base::TimeTicks now,
                                                   TaskQueue* queue) {
-  std::pair<TaskQueueMap::iterator, bool> insert_result =
-      task_queue_throttler_->queue_details_.insert(
-          std::make_pair(queue, Metadata(0, queue->IsQueueEnabled())));
-  Metadata& metadata = insert_result.first->second;
+  Metadata& metadata = task_queue_throttler_->queue_details_[queue];
   DCHECK(!metadata.time_budget_pool);
   metadata.time_budget_pool = this;
 
   associated_task_queues_.insert(queue);
 
-  if (!is_enabled_ || !metadata.IsThrottled())
+  if (!metadata.IsThrottled())
     return;
 
   queue->SetQueueEnabled(false);
@@ -116,7 +113,7 @@ void TaskQueueThrottler::TimeBudgetPool::RemoveQueue(base::TimeTicks now,
   task_queue_throttler_->MaybeDeleteQueueMetadata(find_it);
   associated_task_queues_.erase(queue);
 
-  if (!is_enabled_ || !is_throttled)
+  if (is_throttled)
     return;
 
   task_queue_throttler_->MaybeSchedulePumpQueue(FROM_HERE, now, queue,
@@ -271,10 +268,8 @@ void TaskQueueThrottler::SetQueueEnabled(TaskQueue* task_queue, bool enabled) {
 
   find_it->second.enabled = enabled;
 
-  if (!find_it->second.IsThrottled()) {
-    task_queue->SetQueueEnabled(enabled);
+  if (!find_it->second.IsThrottled())
     return;
-  }
 
   // We don't enable the queue here because it's throttled and there might be
   // tasks in it's work queue that would execute immediatly rather than after