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

Unified Diff: media/cast/receiver/video_decoder_unittest.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
Index: media/cast/receiver/video_decoder_unittest.cc
diff --git a/media/cast/receiver/video_decoder_unittest.cc b/media/cast/receiver/video_decoder_unittest.cc
index c7c39ad2d06b1fc71e6cd9fe92b1676cc78ecfe2..7ea4b5da141d19e22a0de74345cd97575a284a71 100644
--- a/media/cast/receiver/video_decoder_unittest.cc
+++ b/media/cast/receiver/video_decoder_unittest.cc
@@ -44,6 +44,11 @@ class VideoDecoderTest : public ::testing::TestWithParam<Codec> {
vp8_encoder_.Initialize();
}
+ virtual ~VideoDecoderTest() {
+ // Make sure all threads have stopped before the environment goes away.
+ cast_environment_->Shutdown();
+ }
+
protected:
virtual void SetUp() OVERRIDE {
video_decoder_.reset(new VideoDecoder(cast_environment_, GetParam()));
« no previous file with comments | « media/cast/receiver/audio_decoder_unittest.cc ('k') | media/cast/test/utility/standalone_cast_environment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698