Split Closure part of TestPendingTask out of the struct

cc/test/ordered_simple_task_runner.h

 // Copyright 2014 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 CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 #define CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_
 
 #include <stddef.h>
 
 #include <limits>
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event.h"
 
 namespace cc {
 
 // Subclass of TestPendingTask which has a unique ID for every task, supports
 // being used inside a std::set and has debug tracing support.
-class TestOrderablePendingTask : public base::TestPendingTask {
+class TestOrderablePendingTaskInfo : public base::TestPendingTaskInfo {
  public:
-  TestOrderablePendingTask();
-  TestOrderablePendingTask(const tracked_objects::Location& location,
-                           const base::Closure& task,
-                           base::TimeTicks post_time,
-                           base::TimeDelta delay,
-                           TestNestability nestability);
-  ~TestOrderablePendingTask();
+  TestOrderablePendingTaskInfo();
+  TestOrderablePendingTaskInfo(const tracked_objects::Location& location,
+                               base::TimeTicks post_time,
+                               base::TimeDelta delay,
+                               TestNestability nestability);
+  ~TestOrderablePendingTaskInfo();
 
   // operators needed by std::set and comparison
-  bool operator==(const TestOrderablePendingTask& other) const;
-  bool operator<(const TestOrderablePendingTask& other) const;
+  bool operator==(const TestOrderablePendingTaskInfo& other) const;
+  bool operator<(const TestOrderablePendingTaskInfo& other) const;
 
   // base::trace_event tracing functionality
   std::unique_ptr<base::trace_event::ConvertableToTraceFormat> AsValue() const;
   void AsValueInto(base::trace_event::TracedValue* state) const;
 
+  size_t task_id() const { return task_id_; }
+
  private:
   static size_t task_id_counter;
   const size_t task_id_;
 };
 
+using TestOrderablePendingTaskQueue =
+    std::map<TestOrderablePendingTaskInfo, base::OnceClosure>;
+
 // This runs pending tasks based on task's post_time + delay.
 // We should not execute a delayed task sooner than some of the queued tasks
 // which don't have a delay even though it is queued early.
 class OrderedSimpleTaskRunner : public base::SingleThreadTaskRunner {
  public:
   OrderedSimpleTaskRunner(base::SimpleTestTickClock* now_src, bool advance_now);
 
   // base::TestSimpleTaskRunner implementation:
   bool PostDelayedTask(const tracked_objects::Location& from_here,
                        const base::Closure& task,
@@ skipping 65 matching lines @@
   base::Callback<bool(void)> TaskExistedInitially();
 
   // Stop running tasks when NextTaskTime() >= stop_at
   base::Callback<bool(void)> NowBefore(base::TimeTicks stop_at);
 
   // Advance Now() to the next task to run.
   base::Callback<bool(void)> AdvanceNow();
 
  protected:
   static bool TaskRunCountBelowCallback(size_t max_tasks, size_t* task_run);
-  bool TaskExistedInitiallyCallback(
-      const std::set<TestOrderablePendingTask>& existing_tasks);
+  bool TaskExistedInitiallyCallback(const std::set<size_t>& existing_task_ids);
   bool NowBeforeCallback(base::TimeTicks stop_at);
   bool AdvanceNowCallback();
 
   ~OrderedSimpleTaskRunner() override;
 
   base::ThreadChecker thread_checker_;
 
   bool advance_now_;
   // Not owned.
   base::SimpleTestTickClock* now_src_;
 
   size_t max_tasks_;
 
   bool inside_run_tasks_until_;
-  std::set<TestOrderablePendingTask> pending_tasks_;
+  TestOrderablePendingTaskQueue pending_tasks_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OrderedSimpleTaskRunner);
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_ORDERED_SIMPLE_TASK_RUNNER_H_