Separate the create and start phases in DelayedTaskManager.

base/task_scheduler/delayed_task_manager_unittest.cc

 // Copyright 2016 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_scheduler/delayed_task_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 24 matching lines @@
     DoPostTaskNowCallback(task.get());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockTaskTarget);
 };
 
 class TaskSchedulerDelayedTaskManagerTest : public testing::Test {
  public:
   TaskSchedulerDelayedTaskManagerTest()
-      : service_thread_task_runner_(new TestMockTimeTaskRunner),
-        delayed_task_manager_(service_thread_task_runner_) {}
+      : service_thread_task_runner_(new TestMockTimeTaskRunner) {}
   ~TaskSchedulerDelayedTaskManagerTest() override = default;
 
  protected:
   scoped_refptr<TestMockTimeTaskRunner> service_thread_task_runner_;
   DelayedTaskManager delayed_task_manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TaskSchedulerDelayedTaskManagerTest);
 };
 
 }  // namespace
 
-// Verify that a delayed task isn't forwarded before it is ripe for execution.
-TEST_F(TaskSchedulerDelayedTaskManagerTest, DelayedTaskDoesNotRunTooEarly) {
+// Verify that a delayed task isn't forwarded before Start().
+TEST_F(TaskSchedulerDelayedTaskManagerTest, DelayedTaskDoesNotRunBeforeStart) {
   auto task =
       MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(), kLongDelay);
 
+  testing::StrictMock<MockTaskTarget> task_target;
+
+  // Send |task| to the DelayedTaskManager.
+  delayed_task_manager_.AddDelayedTask(
+      std::move(task),
+      Bind(&MockTaskTarget::PostTaskNowCallback, Unretained(&task_target)));

[gab, 2017/04/12 19:15:51]

BindOnce

[fdoray, 2017/04/19 15:37:55]

Done.

+
+  // Fast-forward time. Don't expect any forwarding to |task_target|.

[gab, 2017/04/12 19:15:51]

What ensures this? Shouldn't your task trigger a failure if ran?

Edit: Oh I see, StrictMock ensures this, that's subtle... hint at this in this
comment? (it's more obvious in following tests that are followed by EXPECT_CALL
statements but this test is hard to read)

[fdoray, 2017/04/19 15:37:55]

Done.

+  service_thread_task_runner_->FastForwardBy(kLongDelay);
+}
+
+// Verify that a delayed task added before Start() is forwarded when it is ripe
+// for execution and Start() is called.
+TEST_F(TaskSchedulerDelayedTaskManagerTest,
+       DelayedTaskPostedBeforeStartRunsAfterStart) {
+  auto task =
+      MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(), kLongDelay);
+  const Task* task_raw = task.get();
+
+  testing::StrictMock<MockTaskTarget> task_target;
+
+  // Send |task| to the DelayedTaskManager.
+  delayed_task_manager_.AddDelayedTask(
+      std::move(task),
+      Bind(&MockTaskTarget::PostTaskNowCallback, Unretained(&task_target)));
+
+  delayed_task_manager_.Start(service_thread_task_runner_);
+
+  // Run tasks on the service thread. Don't expect any forwarding to
+  // |task_target| since the task isn't ripe for execution.
+  service_thread_task_runner_->RunUntilIdle();
+
+  // Fast-forward time. Expect the task to be forwarded to |task_target|.
+  EXPECT_CALL(task_target, DoPostTaskNowCallback(task_raw));
+  service_thread_task_runner_->FastForwardBy(kLongDelay);
+}

[gab, 2017/04/12 19:15:51]

Also test that task that became ripe before start is executed upon Start()?

[fdoray, 2017/04/19 15:37:55]

Done.

+
+// Verify that a delayed task added after Start() isn't forwarded before it is
+// ripe for execution.
+TEST_F(TaskSchedulerDelayedTaskManagerTest, DelayedTaskDoesNotRunTooEarly) {
+  delayed_task_manager_.Start(service_thread_task_runner_);
+  auto task =
+      MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(), kLongDelay);
+
   testing::StrictMock<MockTaskTarget> task_target;
 
   // Send |task| to the DelayedTaskManager.
   delayed_task_manager_.AddDelayedTask(
       std::move(task),
       Bind(&MockTaskTarget::PostTaskNowCallback, Unretained(&task_target)));
 
   // Run tasks that are ripe for execution. Don't expect any forwarding to
   // |task_target|.
   service_thread_task_runner_->RunUntilIdle();
 }
 
-// Verify that a delayed task is forwarded when it is ripe for execution.
+// Verify that a delayed task added after Start() is forwarded when it is ripe
+// for execution.
 TEST_F(TaskSchedulerDelayedTaskManagerTest, DelayedTaskRunsAfterDelay) {
+  delayed_task_manager_.Start(service_thread_task_runner_);
   auto task =
       MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(), kLongDelay);
   const Task* task_raw = task.get();
 
   testing::StrictMock<MockTaskTarget> task_target;
 
   // Send |task| to the DelayedTaskManager.
   delayed_task_manager_.AddDelayedTask(
       std::move(task),
       Bind(&MockTaskTarget::PostTaskNowCallback, Unretained(&task_target)));
 
   // Fast-forward time. Expect the task is forwarded to |task_target|.
   EXPECT_CALL(task_target, DoPostTaskNowCallback(task_raw));
   service_thread_task_runner_->FastForwardBy(kLongDelay);
 }
 
-// Verify that multiple delayed tasks are forwarded when they are ripe for
-// execution.
+// Verify that multiple delayed tasks added after Start() are forwarded when
+// they are ripe for execution.
 TEST_F(TaskSchedulerDelayedTaskManagerTest, DelayedTasksRunAfterDelay) {
+  delayed_task_manager_.Start(service_thread_task_runner_);
   auto task_a = MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(),
                                  TimeDelta::FromHours(1));
   const Task* task_a_raw = task_a.get();
 
   auto task_b = MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(),
                                  TimeDelta::FromHours(2));
   const Task* task_b_raw = task_b.get();
 
   auto task_c = MakeUnique<Task>(FROM_HERE, Bind(&DoNothing), TaskTraits(),
                                  TimeDelta::FromHours(1));
@@ skipping 24 matching lines @@
   testing::Mock::VerifyAndClear(&task_target);
 
   // Fast-forward time. Expect |task_b_raw| to be forwarded to |task_target|.
   EXPECT_CALL(task_target, DoPostTaskNowCallback(task_b_raw));
   service_thread_task_runner_->FastForwardBy(TimeDelta::FromHours(1));
   testing::Mock::VerifyAndClear(&task_target);
 }
 
 }  // namespace internal
 }  // namespace base