Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(866)

Unified Diff: media/base/test_helpers.cc

Issue 2021273002: Extending timeout for AudioRendererSinkCacheTest.SmokeTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adding forgotten const Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/test_helpers.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/test_helpers.cc
diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc
index 0ab19032f52963c5af26e5b51a5fb72ba4e4d3a1..60581554ea797e0e54c71e4f952e7374ca74cf49 100644
--- a/media/base/test_helpers.cc
+++ b/media/base/test_helpers.cc
@@ -64,9 +64,13 @@ PipelineStatusCB NewExpectedStatusCB(PipelineStatus status) {
}
WaitableMessageLoopEvent::WaitableMessageLoopEvent()
+ : WaitableMessageLoopEvent(TestTimeouts::action_timeout()) {}
+
+WaitableMessageLoopEvent::WaitableMessageLoopEvent(base::TimeDelta timeout)
: message_loop_(base::MessageLoop::current()),
signaled_(false),
- status_(PIPELINE_OK) {
+ status_(PIPELINE_OK),
+ timeout_(timeout) {
DCHECK(message_loop_);
}
@@ -98,8 +102,9 @@ void WaitableMessageLoopEvent::RunAndWaitForStatus(PipelineStatus expected) {
run_loop_.reset(new base::RunLoop());
base::Timer timer(false, false);
- timer.Start(FROM_HERE, TestTimeouts::action_timeout(), base::Bind(
- &WaitableMessageLoopEvent::OnTimeout, base::Unretained(this)));
+ timer.Start(
+ FROM_HERE, timeout_,
+ base::Bind(&WaitableMessageLoopEvent::OnTimeout, base::Unretained(this)));
run_loop_->Run();
EXPECT_TRUE(signaled_);
« no previous file with comments | « media/base/test_helpers.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698