Split Closure part of TestPendingTask out of the struct

cc/test/ordered_simple_task_runner_unittest.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 <memory>
 #include <string>
 
 #include "base/cancelable_callback.h"
 #include "base/format_macros.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
-#include "base/test/test_pending_task.h"
+#include "base/test/test_pending_task_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // We pass EXPECT_TRUE / EXPECT_FALSE macros rather than a boolean as on some
 // compilers EXPECT_EQ(false, XXXX) fails to compile as gtest tries to convert
 // the false value to null causing a -Werror=conversion-null error.
 #define RUN_AND_CHECK_RESULT(                             \
     tasks_remain_expect_macro, run_func, expected_result) \
   tasks_remain_expect_macro(task_runner_->run_func);      \
   EXPECT_EQ(expected_result, executed_tasks_);            \
   executed_tasks_ = "";
 
 namespace {
 
 bool ReturnTrue() {
   return true;
 }
 
 bool ReturnFalse() {
   return false;
 }
 };
 
 namespace cc {
 
 TEST(TestOrderablePendingTask, Ordering) {
-  TestOrderablePendingTask a;
-  TestOrderablePendingTask b;
-  TestOrderablePendingTask c;
+  TestOrderablePendingTaskInfo a;
+  TestOrderablePendingTaskInfo b;
+  TestOrderablePendingTaskInfo c;
 
   EXPECT_EQ(a, a);
   EXPECT_EQ(b, b);
   EXPECT_EQ(c, c);
   EXPECT_LT(a, b);
   EXPECT_LT(b, c);
   EXPECT_LT(a, c);
 
-  TestOrderablePendingTask a2 = a;
+  TestOrderablePendingTaskInfo a2 = a;
   EXPECT_EQ(a, a2);
   EXPECT_LT(a2, b);
   EXPECT_LT(b, c);
   EXPECT_LT(a2, c);
 }
 
 class OrderedSimpleTaskRunnerTest : public testing::Test {
  public:
   OrderedSimpleTaskRunnerTest()
       : now_src_(new base::SimpleTestTickClock()),
@@ skipping 374 matching lines @@
 
   task_runner_->SetRunTaskLimit(0);
   RUN_AND_CHECK_RESULT(EXPECT_TRUE, RunUntilTime(run_to), "");
 
   task_runner_->SetRunTaskLimit(100);
   RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilTime(run_to), "4(4ms) 5(5ms)");
   EXPECT_EQ(run_to, now_src_->NowTicks());
 }
 
 }  // namespace cc