diff --git a/api/test/time_controller.cc b/api/test/time_controller.cc index f2b1a05c16..364dbc235d 100644 --- a/api/test/time_controller.cc +++ b/api/test/time_controller.cc @@ -26,7 +26,7 @@ std::unique_ptr TimeController::CreateTaskQueueFactory() { }; return std::make_unique(GetTaskQueueFactory()); } -bool TimeController::Wait(const std::function& done, +bool TimeController::Wait(const std::function& condition, TimeDelta max_duration) { // Step size is chosen to be short enough to not significantly affect latency // in real time tests while being long enough to avoid adding too much load to @@ -34,10 +34,10 @@ bool TimeController::Wait(const std::function& done, const auto kStep = TimeDelta::Millis(5); for (auto elapsed = TimeDelta::Zero(); elapsed < max_duration; elapsed += kStep) { - if (done()) + if (condition()) return true; AdvanceTime(kStep); } - return done(); + return condition(); } } // namespace webrtc diff --git a/api/test/time_controller.h b/api/test/time_controller.h index 3276b4fbdd..4d7f9e6c39 100644 --- a/api/test/time_controller.h +++ b/api/test/time_controller.h @@ -57,8 +57,9 @@ class TimeController { // for the given |duration|. virtual void AdvanceTime(TimeDelta duration) = 0; - // Waits until done() == true, polling done() in small time intervals. - bool Wait(const std::function& done, + // Waits until condition() == true, polling condition() in small time + // intervals. + bool Wait(const std::function& condition, TimeDelta max_duration = TimeDelta::Seconds(5)); };