Split Closure part of TestPendingTask out of the struct

cc/test/ordered_simple_task_runner.cc

 // 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.
 
 #include "cc/test/ordered_simple_task_runner.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 10 matching lines @@
 
 #define TRACE_TASK(function, task) \
   TRACE_EVENT_INSTANT1(            \
       "cc", function, TRACE_EVENT_SCOPE_THREAD, "task", task.AsValue());
 
 #define TRACE_TASK_RUN(function, tag, task)
 
 namespace cc {
 
 // TestOrderablePendingTask implementation
-TestOrderablePendingTask::TestOrderablePendingTask()
-    : base::TestPendingTask(),
-      task_id_(TestOrderablePendingTask::task_id_counter++) {
-}
+TestOrderablePendingTaskInfo::TestOrderablePendingTaskInfo()
+    : task_id_(TestOrderablePendingTaskInfo::task_id_counter++) {}
 
-TestOrderablePendingTask::TestOrderablePendingTask(
+TestOrderablePendingTaskInfo::TestOrderablePendingTaskInfo(
     const tracked_objects::Location& location,
-    const base::Closure& task,
     base::TimeTicks post_time,
     base::TimeDelta delay,
     TestNestability nestability)
-    : base::TestPendingTask(location, task, post_time, delay, nestability),
-      task_id_(TestOrderablePendingTask::task_id_counter++) {
-}
+    : base::TestPendingTaskInfo(location, post_time, delay, nestability),
+      task_id_(TestOrderablePendingTaskInfo::task_id_counter++) {}
 
-size_t TestOrderablePendingTask::task_id_counter = 0;
+size_t TestOrderablePendingTaskInfo::task_id_counter = 0;
 
-TestOrderablePendingTask::~TestOrderablePendingTask() {
-}
+TestOrderablePendingTaskInfo::~TestOrderablePendingTaskInfo() {}
 
-bool TestOrderablePendingTask::operator==(
-    const TestOrderablePendingTask& other) const {
+bool TestOrderablePendingTaskInfo::operator==(
+    const TestOrderablePendingTaskInfo& other) const {
   return task_id_ == other.task_id_;
 }
 
-bool TestOrderablePendingTask::operator<(
-    const TestOrderablePendingTask& other) const {
+bool TestOrderablePendingTaskInfo::operator<(
+    const TestOrderablePendingTaskInfo& other) const {
   if (*this == other)
     return false;
 
   if (GetTimeToRun() == other.GetTimeToRun()) {
     return task_id_ < other.task_id_;
   }
   return ShouldRunBefore(other);
 }
 
 std::unique_ptr<base::trace_event::ConvertableToTraceFormat>
-TestOrderablePendingTask::AsValue() const {
+TestOrderablePendingTaskInfo::AsValue() const {
   std::unique_ptr<base::trace_event::TracedValue> state(
       new base::trace_event::TracedValue());
   AsValueInto(state.get());
   return std::move(state);
 }
 
-void TestOrderablePendingTask::AsValueInto(
+void TestOrderablePendingTaskInfo::AsValueInto(
     base::trace_event::TracedValue* state) const {
   state->SetInteger("id", base::saturated_cast<int>(task_id_));
   state->SetInteger("run_at", GetTimeToRun().ToInternalValue());
   state->SetString("posted_from", location.ToString());
 }
 
 OrderedSimpleTaskRunner::OrderedSimpleTaskRunner(
     base::SimpleTestTickClock* now_src,
     bool advance_now)
     : advance_now_(advance_now),
       now_src_(now_src),
       max_tasks_(kAbsoluteMaxTasks),
       inside_run_tasks_until_(false) {
 }
 
 OrderedSimpleTaskRunner::~OrderedSimpleTaskRunner() {}
 
 // static
 base::TimeTicks OrderedSimpleTaskRunner::AbsoluteMaxNow() {
   return base::TimeTicks::FromInternalValue(
       std::numeric_limits<int64_t>::max());
 }
 
 // base::TestSimpleTaskRunner implementation
 bool OrderedSimpleTaskRunner::PostDelayedTask(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeDelta delay) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  TestOrderablePendingTask pt(from_here, task, now_src_->NowTicks(), delay,
-                              base::TestPendingTask::NESTABLE);
+  TestOrderablePendingTaskInfo pt(from_here, now_src_->NowTicks(), delay,
+                                  base::TestPendingTaskInfo::NESTABLE);
 
   TRACE_TASK("OrderedSimpleTaskRunner::PostDelayedTask", pt);
-  pending_tasks_.insert(pt);
+  pending_tasks_.insert(std::make_pair(pt, task));
   return true;
 }
 
 bool OrderedSimpleTaskRunner::PostNonNestableDelayedTask(
     const tracked_objects::Location& from_here,
     const base::Closure& task,
     base::TimeDelta delay) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  TestOrderablePendingTask pt(from_here, task, now_src_->NowTicks(), delay,
-                              base::TestPendingTask::NON_NESTABLE);
+  TestOrderablePendingTaskInfo pt(from_here, now_src_->NowTicks(), delay,
+                                  base::TestPendingTaskInfo::NON_NESTABLE);
 
   TRACE_TASK("OrderedSimpleTaskRunner::PostNonNestableDelayedTask", pt);
-  pending_tasks_.insert(pt);
+  pending_tasks_.insert(std::make_pair(pt, task));
   return true;
 }
 
 bool OrderedSimpleTaskRunner::RunsTasksOnCurrentThread() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return true;
 }
 
 size_t OrderedSimpleTaskRunner::NumPendingTasks() const {
   return pending_tasks_.size();
 }
 
 bool OrderedSimpleTaskRunner::HasPendingTasks() const {
   return pending_tasks_.size() > 0;
 }
 
 base::TimeTicks OrderedSimpleTaskRunner::NextTaskTime() {
   if (pending_tasks_.size() <= 0) {
     return AbsoluteMaxNow();
   }
 
-  return pending_tasks_.begin()->GetTimeToRun();
+  const base::TestPendingTaskInfo& task_info = pending_tasks_.begin()->first;
+  return task_info.GetTimeToRun();
 }
 
 base::TimeDelta OrderedSimpleTaskRunner::DelayToNextTaskTime() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (pending_tasks_.size() <= 0) {
     return AbsoluteMaxNow() - base::TimeTicks();
   }
 
   base::TimeDelta delay = NextTaskTime() - now_src_->NowTicks();
@@ skipping 53 matching lines @@
       if (!condition_success)
         break;
     }
 
     // Conditions could modify the pending task length, so we need to recheck
     // that there are tasks to run.
     if (!condition_success || !HasPendingTasks()) {
       break;
     }
 
-    std::set<TestOrderablePendingTask>::iterator task_to_run =
+    TestOrderablePendingTaskQueue::iterator task_to_run =
         pending_tasks_.begin();
     {
-      TRACE_EVENT1("cc",
-                   "OrderedSimpleTaskRunner::RunPendingTasks running",
-                   "task",
-                   task_to_run->AsValue());
-      task_to_run->task.Run();
+      const base::TestPendingTaskInfo& task_info = task_to_run->first;
+      base::OnceClosure task = std::move(task_to_run->second);
+
+      TRACE_EVENT1("cc", "OrderedSimpleTaskRunner::RunPendingTasks running",
+                   "task", task_info.AsValue());
+      std::move(task).Run();
     }
 
     pending_tasks_.erase(task_to_run);
   }
 
   return HasPendingTasks();
 }
 
 bool OrderedSimpleTaskRunner::RunPendingTasks() {
   return RunTasksWhile(TaskExistedInitially());
@@ skipping 34 matching lines @@
   AsValueInto(state.get());
   return std::move(state);
 }
 
 void OrderedSimpleTaskRunner::AsValueInto(
     base::trace_event::TracedValue* state) const {
   state->SetInteger("pending_tasks",
                     base::saturated_cast<int>(pending_tasks_.size()));
 
   state->BeginArray("tasks");
-  for (std::set<TestOrderablePendingTask>::const_iterator it =
-           pending_tasks_.begin();
-       it != pending_tasks_.end();
-       ++it) {
+  for (const auto& pending_task : pending_tasks_) {
     state->BeginDictionary();
-    it->AsValueInto(state);
+    pending_task.first.AsValueInto(state);
     state->EndDictionary();
   }
   state->EndArray();
 
   state->BeginDictionary("now_src");
   state->SetDouble("now_in_ms", (now_src_->NowTicks() - base::TimeTicks())
                                     .InMillisecondsF());
   state->EndDictionary();
 
   state->SetBoolean("advance_now", advance_now_);
   state->SetBoolean("inside_run_tasks_until", inside_run_tasks_until_);
   state->SetString("max_tasks", base::SizeTToString(max_tasks_));
 }
 
 base::Callback<bool(void)> OrderedSimpleTaskRunner::TaskRunCountBelow(
     size_t max_tasks) {
   return base::Bind(&OrderedSimpleTaskRunner::TaskRunCountBelowCallback,
                     max_tasks,
                     base::Owned(new size_t(0)));
 }
 
 bool OrderedSimpleTaskRunner::TaskRunCountBelowCallback(size_t max_tasks,
                                                         size_t* tasks_run) {
   return (*tasks_run)++ < max_tasks;
 }
 
 base::Callback<bool(void)> OrderedSimpleTaskRunner::TaskExistedInitially() {
-  // base::Bind takes a copy of pending_tasks_
+  std::set<size_t> existing_task_ids;
+  for (const auto& task : pending_tasks_)
+    existing_task_ids.insert(task.first.task_id());
   return base::Bind(&OrderedSimpleTaskRunner::TaskExistedInitiallyCallback,
-                    base::Unretained(this),
-                    pending_tasks_);
+                    base::Unretained(this), std::move(existing_task_ids));
 }
 
 bool OrderedSimpleTaskRunner::TaskExistedInitiallyCallback(
-    const std::set<TestOrderablePendingTask>& existing_tasks) {
-  return existing_tasks.find(*pending_tasks_.begin()) != existing_tasks.end();
+    const std::set<size_t>& existing_task_ids) {
+  const TestOrderablePendingTaskInfo& task_info = pending_tasks_.begin()->first;
+  return existing_task_ids.find(task_info.task_id()) != existing_task_ids.end();
 }
 
 base::Callback<bool(void)> OrderedSimpleTaskRunner::NowBefore(
     base::TimeTicks stop_at) {
   return base::Bind(&OrderedSimpleTaskRunner::NowBeforeCallback,
                     base::Unretained(this),
                     stop_at);
 }
 bool OrderedSimpleTaskRunner::NowBeforeCallback(base::TimeTicks stop_at) {
   return NextTaskTime() <= stop_at;
 }
 
 base::Callback<bool(void)> OrderedSimpleTaskRunner::AdvanceNow() {
   return base::Bind(&OrderedSimpleTaskRunner::AdvanceNowCallback,
                     base::Unretained(this));
 }
 
 bool OrderedSimpleTaskRunner::AdvanceNowCallback() {
   base::TimeTicks next_task_time = NextTaskTime();
   if (now_src_->NowTicks() < next_task_time) {
     now_src_->Advance(next_task_time - now_src_->NowTicks());
   }
   return true;
 }
 
 }  // namespace cc