Fix bug with TaskQueueSelector and blocked queues

components/scheduler/base/work_queue_sets.h

Index: components/scheduler/base/work_queue_sets.h
diff --git a/components/scheduler/base/work_queue_sets.h b/components/scheduler/base/work_queue_sets.h
index 7dd451a3bc41bc5e641254f54ac25adc9362b8c2..0c2c2dcf2c15c939162a07b94e12f82de8f4bf78 100644
--- a/components/scheduler/base/work_queue_sets.h
+++ b/components/scheduler/base/work_queue_sets.h
@@ -22,14 +22,17 @@ class TaskQueueImpl;
 
 class SCHEDULER_EXPORT WorkQueueSets {
  public:
-  explicit WorkQueueSets(size_t num_sets);
+  WorkQueueSets(size_t num_sets, const char* name);
   ~WorkQueueSets();
 
   // O(log num queues)
+  void AddQueue(WorkQueue* queue, size_t set_index);
+
+  // O(log num queues)
   void RemoveQueue(WorkQueue* work_queue);
 
   // O(log num queues)
-  void AssignQueueToSet(WorkQueue* queue, size_t set_index);
+  void ChangeSetIndex(WorkQueue* queue, size_t set_index);
 
   // O(log num queues)
   void OnPushQueue(WorkQueue* work_queue);
@@ -46,12 +49,15 @@ class SCHEDULER_EXPORT WorkQueueSets {
 #if DCHECK_IS_ON() || !defined(NDEBUG)
   // Note this iterates over everything in |enqueue_order_to_work_queue_maps_|.
   // It's intended for use with DCHECKS and for testing
-  bool ContainsWorkQueueForTest(WorkQueue* queue) const;
+  bool ContainsWorkQueueForTest(const WorkQueue* queue) const;
 #endif
 
+  const char* name() const { return name_; }
+
  private:
   typedef std::map<EnqueueOrder, WorkQueue*> EnqueueOrderToWorkQueueMap;
   std::vector<EnqueueOrderToWorkQueueMap> enqueue_order_to_work_queue_maps_;
+  const char* name_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkQueueSets);
 };