Fix bug with TaskQueueSelector and blocked queues

components/scheduler/base/work_queue.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 CONTENT_RENDERER_SCHEDULER_BASE_WORK_QUEUE_H_
 #define CONTENT_RENDERER_SCHEDULER_BASE_WORK_QUEUE_H_
 
 #include <stddef.h>
 
 #include <set>
 
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/scheduler/base/enqueue_order.h"
 #include "components/scheduler/base/task_queue_impl.h"
 #include "components/scheduler/scheduler_export.h"
 
 namespace scheduler {
 namespace internal {
 class WorkQueueSets;
 
 class SCHEDULER_EXPORT WorkQueue {
  public:
   WorkQueue(TaskQueueImpl* task_queue, const char* name);
   ~WorkQueue();
 
   // Associates this work queue with the given work queue sets. This must be
   // called before any tasks can be inserted into this work queue.
-  void AssignToWorkQueueSets(WorkQueueSets* work_queue_sets,
-                             size_t work_queue_set_index);
+  void AssignToWorkQueueSets(WorkQueueSets* work_queue_sets);
+
+  // Assigns the current set index.
+  void AssignSetIndex(size_t work_queue_set_index);
 
   void AsValueInto(base::trace_event::TracedValue* state) const;
 
   // Clears the |work_queue_|.
   void Clear();
 
   // returns true if the |work_queue_| is empty.
   bool Empty() const { return work_queue_.empty(); }
 
   // If the |work_queue_| isn't empty, |enqueue_order| gets set to the enqueue
@@ skipping 44 matching lines @@
   WorkQueueSets* work_queue_sets_;  // NOT OWNED.
   TaskQueueImpl* task_queue_;       // NOT OWNED.
   size_t work_queue_set_index_;
   const char* name_;
 };
 
 }  // namespace internal
 }  // namespace scheduler
 
 #endif  // CONTENT_RENDERER_SCHEDULER_BASE_WORK_QUEUE_H_