[Reland] Make canceling Timers fast.

third_party/WebKit/Source/platform/scheduler/base/work_queue_sets_unittest.cc

 // 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.
 
 #include "platform/scheduler/base/work_queue_sets.h"
 
 #include <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "platform/scheduler/base/work_queue.h"
@@ skipping 17 matching lines @@
         work_queue_sets_->RemoveQueue(work_queue.get());
     }
   }
 
  protected:
   enum {
     kNumSets = 5  // An arbitary choice.
   };
 
   WorkQueue* NewTaskQueue(const char* queue_name) {
-    WorkQueue* queue = new WorkQueue(
-        nullptr, "test", TaskQueueImpl::Task::EnqueueOrderComparatorFn);
+    WorkQueue* queue = new WorkQueue(nullptr, "test");
     work_queues_.push_back(base::WrapUnique(queue));
     work_queue_sets_->AddQueue(queue, TaskQueue::CONTROL_PRIORITY);
     return queue;
   }
 
   TaskQueueImpl::Task FakeTaskWithEnqueueOrder(int enqueue_order) {
     TaskQueueImpl::Task fake_task(FROM_HERE, base::Closure(), base::TimeTicks(),
                                   0, true);
     fake_task.set_enqueue_order(enqueue_order);
     return fake_task;
@@ skipping 255 matching lines @@
   EXPECT_FALSE(work_queue_sets_->IsSetEmpty(set));
 
   work_queue->PopTaskForTest();
   work_queue_sets_->OnPopQueue(work_queue);
   EXPECT_TRUE(work_queue_sets_->IsSetEmpty(set));
 }
 
 }  // namespace internal
 }  // namespace scheduler
 }  // namespace blink