Revert of [scheduler] Add TaskQueue::Observer

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_TASK_QUEUE_THROTTLER_H_
 #define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_TASK_QUEUE_THROTTLER_H_
 
 #include <set>
 #include <unordered_map>
 
@@ skipping 28 matching lines @@
   // To be used by BudgetPool only, use BudgetPool::{Add,Remove}Queue
   // methods instead.
   virtual void AddQueueToBudgetPool(TaskQueue* queue,
                                     BudgetPool* budget_pool) = 0;
   virtual void RemoveQueueFromBudgetPool(TaskQueue* queue,
                                          BudgetPool* budget_pool) = 0;
 
   // Deletes the budget pool.
   virtual void UnregisterBudgetPool(BudgetPool* budget_pool) = 0;
 
-  // Insert a fence to prevent tasks from running and schedule a wake_up at
+  // Insert a fence to prevent tasks from running and schedule a wakeup at
   // an appropriate time.
   virtual void BlockQueue(base::TimeTicks now, TaskQueue* queue) = 0;
 
   // Schedule a call to unblock queue at an appropriate moment.
   virtual void UnblockQueue(base::TimeTicks now, TaskQueue* queue) = 0;
 
   // Returns true if the |queue| is throttled (i.e. added to TaskQueueThrottler
   // and throttling is not disabled).
   virtual bool IsThrottled(TaskQueue* queue) const = 0;
 };
@@ skipping 13 matching lines @@
 // policy reasons. To prevent the systems from fighting, clients of
 // TaskQueueThrottler must use SetQueueEnabled rather than calling the function
 // directly on the queue.
 //
 // There may be more than one system that wishes to throttle a queue (e.g.
 // renderer suspension vs tab level suspension) so the TaskQueueThrottler keeps
 // a count of the number of systems that wish a queue to be throttled.
 // See IncreaseThrottleRefCount & DecreaseThrottleRefCount.
 //
 // This class is main-thread only.
-class BLINK_PLATFORM_EXPORT TaskQueueThrottler : public TaskQueue::Observer,
+class BLINK_PLATFORM_EXPORT TaskQueueThrottler : public TimeDomain::Observer,
                                                  public BudgetPoolController {
  public:
   // TODO(altimin): Do not pass tracing category as const char*,
   // hard-code string instead.
   TaskQueueThrottler(RendererSchedulerImpl* renderer_scheduler,
                      const char* tracing_category);
 
   ~TaskQueueThrottler() override;
 
-  // TaskQueue::Observer implementation:
-  void OnQueueNextWakeUpChanged(TaskQueue* queue,
-                                base::TimeTicks wake_up) override;
+  // TimeDomain::Observer implementation:
+  void OnTimeDomainHasImmediateWork(TaskQueue*) override;
+  void OnTimeDomainHasDelayedWork(TaskQueue*) override;
 
   // BudgetPoolController implementation:
   void AddQueueToBudgetPool(TaskQueue* queue, BudgetPool* budget_pool) override;
   void RemoveQueueFromBudgetPool(TaskQueue* queue,
                                  BudgetPool* budget_pool) override;
   void UnregisterBudgetPool(BudgetPool* budget_pool) override;
   void BlockQueue(base::TimeTicks now, TaskQueue* queue) override;
   void UnblockQueue(base::TimeTicks now, TaskQueue* queue) override;
   bool IsThrottled(TaskQueue* queue) const override;
 
@@ skipping 59 matching lines @@
   base::TimeTicks GetNextAllowedRunTime(base::TimeTicks now, TaskQueue* queue);
 
   void MaybeDeleteQueueMetadata(TaskQueueMap::iterator it);
 
   // Schedule a call PumpThrottledTasks at an appropriate moment for this queue.
   void SchedulePumpQueue(const tracked_objects::Location& from_here,
                          base::TimeTicks now,
                          TaskQueue* queue);
 
   TaskQueueMap queue_details_;
-  base::Callback<void(TaskQueue*, base::TimeTicks)>
-      forward_immediate_work_callback_;
+  base::Callback<void(TaskQueue*)> forward_immediate_work_callback_;
   scoped_refptr<TaskQueue> task_runner_;
   RendererSchedulerImpl* renderer_scheduler_;  // NOT OWNED
   base::TickClock* tick_clock_;                // NOT OWNED
   const char* tracing_category_;               // NOT OWNED
   std::unique_ptr<ThrottledTimeDomain> time_domain_;
 
   CancelableClosureHolder pump_throttled_tasks_closure_;
   base::Optional<base::TimeTicks> pending_pump_throttled_tasks_runtime_;
   bool allow_throttling_;
 
   std::unordered_map<BudgetPool*, std::unique_ptr<BudgetPool>> budget_pools_;
 
   base::WeakPtrFactory<TaskQueueThrottler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskQueueThrottler);
 };
 
 }  // namespace scheduler
 }  // namespace blink
 
 #endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_RENDERER_TASK_QUEUE_THROTTLER_H_