Refactor History's CommitLaterTask with CancelableCallback

base/task/cancelable_task_tracker_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 "base/task/cancelable_task_tracker.h"
 
 #include <cstddef>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 298 matching lines @@
 
   test_task_runner->RunUntilIdle();
 
   EXPECT_TRUE(task_tracker_.HasTrackedTasks());
 
   RunCurrentLoopUntilIdle();
 
   EXPECT_FALSE(task_tracker_.HasTrackedTasks());
 }
 
+// Post a task with a delay and cancel it.  HasTrackedTasks() should return true
+// from when the task is posted until it is canceled.
+TEST_F(CancelableTaskTrackerTest, HasTrackedTasksPostDelayed) {

[Marc Treib, 2017/02/02 10:52:21]

I think there's a few more tests here that should be extended/duplicated to also
cover the new PostDelayed

[mastiz, 2017/02/02 12:35:54]

I added these but then rethought the whole approach.

+  scoped_refptr<TestSimpleTaskRunner> test_task_runner(
+      new TestSimpleTaskRunner());
+
+  EXPECT_FALSE(task_tracker_.HasTrackedTasks());
+
+  ignore_result(task_tracker_.PostDelayedTask(
+      test_task_runner.get(), FROM_HERE, MakeExpectedNotRunClosure(FROM_HERE),
+      base::TimeDelta::FromSeconds(1)));
+
+  task_tracker_.TryCancelAll();
+
+  test_task_runner->RunUntilIdle();
+
+  EXPECT_TRUE(task_tracker_.HasTrackedTasks());
+
+  RunCurrentLoopUntilIdle();
+
+  EXPECT_FALSE(task_tracker_.HasTrackedTasks());
+}
+
 // Create a new tracked task ID.  HasTrackedTasks() should return true
 // until the IsCanceledCallback is destroyed.
 TEST_F(CancelableTaskTrackerTest, HasTrackedTasksIsCancelled) {
   EXPECT_FALSE(task_tracker_.HasTrackedTasks());
 
   CancelableTaskTracker::IsCanceledCallback is_canceled;
   ignore_result(task_tracker_.NewTrackedTaskId(&is_canceled));
 
   task_tracker_.TryCancelAll();
 
@@ skipping 75 matching lines @@
 
   bad_thread.task_runner()->PostTask(
       FROM_HERE,
       Bind(&MaybeRunDeadlyTaskTrackerMemberFunction, Unretained(&task_tracker_),
            Bind(&CancelableTaskTracker::TryCancelAll)));
 
   test_task_runner->RunUntilIdle();
 }
 
 }  // namespace base