Split Closure part of TestPendingTask out of the struct

base/test/test_simple_task_runner.h

 // Copyright (c) 2012 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 BASE_TEST_TEST_SIMPLE_TASK_RUNNER_H_
 #define BASE_TEST_TEST_SIMPLE_TASK_RUNNER_H_
 
 #include <deque>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
-#include "base/test/test_pending_task.h"
+#include "base/test/test_pending_task_info.h"
 #include "base/threading/platform_thread.h"
 
 namespace base {
 
 class TimeDelta;
 
 // TestSimpleTaskRunner is a simple TaskRunner implementation that can
 // be used for testing.  It implements SingleThreadTaskRunner as that
 // interface implements SequencedTaskRunner, which in turn implements
 // TaskRunner, so TestSimpleTaskRunner can be passed in to a function
@@ skipping 19 matching lines @@
   // SingleThreadTaskRunner implementation.
   bool PostDelayedTask(const tracked_objects::Location& from_here,
                        const Closure& task,
                        TimeDelta delay) override;
   bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here,
                                   const Closure& task,
                                   TimeDelta delay) override;
 
   bool RunsTasksOnCurrentThread() const override;
 
-  std::deque<TestPendingTask> TakePendingTasks();
+  TestPendingTaskQueue TakePendingTasks();
   size_t NumPendingTasks() const;
   bool HasPendingTask() const;
   base::TimeDelta NextPendingTaskDelay() const;
   base::TimeDelta FinalPendingTaskDelay() const;
 
   // Clears the queue of pending tasks without running them.
   void ClearPendingTasks();
 
   // Runs each current pending task in order and clears the queue. Tasks posted
   // by the tasks that run within this call do not run within this call. Can
   // only be called on the thread that created this TestSimpleTaskRunner.
   void RunPendingTasks();
 
   // Runs pending tasks until the queue is empty. Can only be called on the
   // thread that created this TestSimpleTaskRunner.
   void RunUntilIdle();
 
  protected:
   ~TestSimpleTaskRunner() override;
 
  private:
   // Thread on which this was instantiated.
   const PlatformThreadRef thread_ref_ = PlatformThread::CurrentRef();
 
   // Synchronizes access to |pending_tasks_|.
   mutable Lock lock_;
 
-  std::deque<TestPendingTask> pending_tasks_;
+  TestPendingTaskQueue pending_tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSimpleTaskRunner);
 };
 
 }  // namespace base
 
 #endif  // BASE_TEST_TEST_SIMPLE_TASK_RUNNER_H_