| Index: cc/test/ordered_simple_task_runner.cc
|
| diff --git a/cc/test/ordered_simple_task_runner.cc b/cc/test/ordered_simple_task_runner.cc
|
| index a3d66ee6d3a58510e49557842b0498955f17fc83..9dc4bbcd2dacb680d586699576a632e286aab037 100644
|
| --- a/cc/test/ordered_simple_task_runner.cc
|
| +++ b/cc/test/ordered_simple_task_runner.cc
|
| @@ -247,9 +247,11 @@ bool OrderedSimpleTaskRunner::RunUntilTime(base::TimeTicks time) {
|
| // Run tasks
|
| bool result = RunTasksWhile(NowBefore(time));
|
|
|
| + bool has_reached_task_limit = HasPendingTasks() && NextTaskTime() <= time;
|
| +
|
| // If the next task is after the stopping time and auto-advancing now, then
|
| // force time to be the stopping time.
|
| - if (!result && advance_now_ && now_src_->NowTicks() < time) {
|
| + if (!has_reached_task_limit && advance_now_ && now_src_->NowTicks() < time) {
|
| now_src_->Advance(time - now_src_->NowTicks());
|
| }
|
|
|
|
|