| Index: cc/test/ordered_simple_task_runner_unittest.cc
|
| diff --git a/cc/test/ordered_simple_task_runner_unittest.cc b/cc/test/ordered_simple_task_runner_unittest.cc
|
| index 437235ea1d3a6923af6004b2b4ae2ee9cd3bc9b0..97c1974d0370d9b2dd510ff69ffa6ec9f47b736c 100644
|
| --- a/cc/test/ordered_simple_task_runner_unittest.cc
|
| +++ b/cc/test/ordered_simple_task_runner_unittest.cc
|
| @@ -295,7 +295,9 @@ TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeAutoNow) {
|
|
|
| task_runner_->SetAutoAdvanceNowToPendingTasks(true);
|
|
|
| - base::TimeTicks run_at = base::TimeTicks();
|
| + // SimpleTestTickClock starts at 1 microsecond
|
| + base::TimeTicks run_at =
|
| + base::TimeTicks() + base::TimeDelta::FromMicroseconds(1);
|
|
|
| run_at += base::TimeDelta::FromMilliseconds(2);
|
| RUN_AND_CHECK_RESULT(
|
| @@ -318,7 +320,9 @@ TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeManualNow) {
|
|
|
| task_runner_->SetAutoAdvanceNowToPendingTasks(false);
|
|
|
| - base::TimeTicks run_at = base::TimeTicks();
|
| + // SimpleTestTickClock starts at 1 microsecond
|
| + base::TimeTicks run_at =
|
| + base::TimeTicks() + base::TimeDelta::FromMicroseconds(1);
|
|
|
| run_at += base::TimeDelta::FromMilliseconds(2);
|
| RUN_AND_CHECK_RESULT(
|
| @@ -342,18 +346,22 @@ TEST_F(OrderedSimpleTaskRunnerTest, RunForPeriod) {
|
| RUN_AND_CHECK_RESULT(EXPECT_TRUE,
|
| RunForPeriod(base::TimeDelta::FromMilliseconds(2)),
|
| "1(0ms) -1(0ms) 2(2ms) -2(2ms)");
|
| - EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(2),
|
| + // SimpleTestTickClock starts at 1 microsecond
|
| + EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMicroseconds(1) +
|
| + base::TimeDelta::FromMilliseconds(2),
|
| now_src_->NowTicks());
|
|
|
| RUN_AND_CHECK_RESULT(EXPECT_FALSE,
|
| RunForPeriod(base::TimeDelta::FromMilliseconds(1)),
|
| "3(3ms) -3(3ms)");
|
| - EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(3),
|
| + EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMicroseconds(1) +
|
| + base::TimeDelta::FromMilliseconds(3),
|
| now_src_->NowTicks());
|
|
|
| RUN_AND_CHECK_RESULT(
|
| EXPECT_FALSE, RunForPeriod(base::TimeDelta::FromMilliseconds(1)), "");
|
| - EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(4),
|
| + EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMicroseconds(1) +
|
| + base::TimeDelta::FromMilliseconds(4),
|
| now_src_->NowTicks());
|
| }
|
|
|
| @@ -371,7 +379,9 @@ TEST_F(OrderedSimpleTaskRunnerTest, EmptyTaskList) {
|
| RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunPendingTasks(), "");
|
| RUN_AND_CHECK_RESULT(EXPECT_FALSE, RunUntilIdle(), "");
|
|
|
| - ASSERT_EQ(base::TimeTicks(), now_src_->NowTicks());
|
| + // SimpleTestTickClock starts at 1 microsecond
|
| + ASSERT_EQ(base::TimeTicks() + base::TimeDelta::FromMicroseconds(1),
|
| + now_src_->NowTicks());
|
|
|
| RUN_AND_CHECK_RESULT(
|
| EXPECT_FALSE, RunUntilTime(base::TimeTicks::FromInternalValue(100)), "");
|
| @@ -417,7 +427,10 @@ TEST_F(OrderedSimpleTaskRunnerTest, RunUntilIdleTimeout) {
|
| }
|
|
|
| TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeout) {
|
| - base::TimeTicks run_to = base::TimeTicks() + base::TimeDelta::FromSeconds(1);
|
| + // SimpleTestTickClock starts at 1 microsecond
|
| + base::TimeTicks run_to = base::TimeTicks() +
|
| + base::TimeDelta::FromMicroseconds(1) +
|
| + base::TimeDelta::FromSeconds(1);
|
|
|
| PostTask(1, base::TimeDelta::FromMilliseconds(1));
|
| PostTask(2, base::TimeDelta::FromMilliseconds(2));
|
| @@ -425,11 +438,13 @@ TEST_F(OrderedSimpleTaskRunnerTest, RunUntilTimeout) {
|
| PostTask(4, base::TimeDelta::FromMilliseconds(4));
|
| PostTask(5, base::TimeDelta::FromMilliseconds(5));
|
|
|
| - EXPECT_EQ(base::TimeTicks(), now_src_->NowTicks());
|
| + EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMicroseconds(1),
|
| + now_src_->NowTicks());
|
| task_runner_->SetRunTaskLimit(3);
|
| RUN_AND_CHECK_RESULT(
|
| EXPECT_TRUE, RunUntilTime(run_to), "1(1ms) 2(2ms) 3(3ms)");
|
| - EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMilliseconds(3),
|
| + EXPECT_EQ(base::TimeTicks() + base::TimeDelta::FromMicroseconds(1) +
|
| + base::TimeDelta::FromMilliseconds(3),
|
| now_src_->NowTicks());
|
|
|
| task_runner_->SetRunTaskLimit(0);
|
|
|