Fix bug with TaskQueueSelector and blocked queues

components/scheduler/base/task_queue_selector.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 COMPONENTS_SCHEDULER_BASE_TASK_QUEUE_SELECTOR_H_
 #define COMPONENTS_SCHEDULER_BASE_TASK_QUEUE_SELECTOR_H_
 
 #include <stddef.h>
 
 #include <set>
@@ skipping 67 matching lines @@
   // on the main thread. If |observer| is null, then no callbacks will occur.
   void SetTaskQueueSelectorObserver(Observer* observer);
 
   // Returns true if all the enabled work queues are empty. Returns false
   // otherwise.
   bool EnabledWorkQueuesEmpty() const;
 
  protected:
   class SCHEDULER_EXPORT PrioritizingSelector {
    public:
-    PrioritizingSelector(TaskQueueSelector* task_queue_selector);
+    PrioritizingSelector(TaskQueueSelector* task_queue_selector,
+                         const char* name);
 
-    void AssignQueueToSet(internal::TaskQueueImpl* queue,
-                          TaskQueue::QueuePriority priority);
+    void ChangeSetIndex(internal::TaskQueueImpl* queue,
+                        TaskQueue::QueuePriority priority);
+    void AddQueue(internal::TaskQueueImpl* queue,
+                  TaskQueue::QueuePriority priority);
     void RemoveQueue(internal::TaskQueueImpl* queue);
 
     bool SelectWorkQueueToService(TaskQueue::QueuePriority max_priority,
                                   WorkQueue** out_work_queue,
                                   bool* out_chose_delayed_over_immediate);
 
     WorkQueueSets* delayed_work_queue_sets() {
       return &delayed_work_queue_sets_;
     }
     WorkQueueSets* immediate_work_queue_sets() {
       return &immediate_work_queue_sets_;
     }
 
     const WorkQueueSets* delayed_work_queue_sets() const {
       return &delayed_work_queue_sets_;
     }
     const WorkQueueSets* immediate_work_queue_sets() const {
       return &immediate_work_queue_sets_;
     }
 
     bool ChooseOldestWithPriority(TaskQueue::QueuePriority priority,
                                   bool* out_chose_delayed_over_immediate,
                                   WorkQueue** out_work_queue) const;
 
+#if DCHECK_IS_ON() || !defined(NDEBUG)
+    bool CheckContainsQueueForTest(const internal::TaskQueueImpl* queue) const;
+#endif
+
    private:
     bool ChooseOldestImmediateTaskWithPriority(
         TaskQueue::QueuePriority priority,
         WorkQueue** out_work_queue) const;
 
     bool ChooseOldestDelayedTaskWithPriority(TaskQueue::QueuePriority priority,
                                              WorkQueue** out_work_queue) const;
 
     // Return true if |out_queue| contains the queue with the oldest pending
     // task from the set of queues of |priority|, or false if all queues of that
@@ skipping 64 matching lines @@
   size_t num_blocked_queues_to_report_;
 
   Observer* task_queue_selector_observer_;  // NOT OWNED
   DISALLOW_COPY_AND_ASSIGN(TaskQueueSelector);
 };
 
 }  // namespace internal
 }  // namespace scheduler
 
 #endif  // COMPONENTS_SCHEDULER_BASE_TASK_QUEUE_SELECTOR_H