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

Unified Diff: media/cast/test/utility/standalone_cast_environment.cc

Issue 436673004: Fix flaky cast_unittests where threads were being joined incorrectly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/cast/test/utility/standalone_cast_environment.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/utility/standalone_cast_environment.cc
diff --git a/media/cast/test/utility/standalone_cast_environment.cc b/media/cast/test/utility/standalone_cast_environment.cc
index 562079e796481afc070c93e9a5d66b3426d32682..c9dcb0b9caf92c1d4247329c7c129d8c7a8063f4 100644
--- a/media/cast/test/utility/standalone_cast_environment.cc
+++ b/media/cast/test/utility/standalone_cast_environment.cc
@@ -30,11 +30,14 @@ StandaloneCastEnvironment::StandaloneCastEnvironment()
}
StandaloneCastEnvironment::~StandaloneCastEnvironment() {
- DCHECK(CalledOnValidThread());
+ CHECK(CalledOnValidThread());
+ CHECK(!main_thread_.IsRunning());
+ CHECK(!audio_thread_.IsRunning());
+ CHECK(!video_thread_.IsRunning());
}
void StandaloneCastEnvironment::Shutdown() {
- DCHECK(CalledOnValidThread());
+ CHECK(CalledOnValidThread());
main_thread_.Stop();
audio_thread_.Stop();
video_thread_.Stop();
« no previous file with comments | « media/cast/test/utility/standalone_cast_environment.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698