| Index: media/filters/video_decoder_selector_unittest.cc
|
| diff --git a/media/filters/video_decoder_selector_unittest.cc b/media/filters/video_decoder_selector_unittest.cc
|
| index b2afbaaab6239467550965d5474b591bb08ff5f1..4347d368ce93075672daf8d10689a0ed419eb566 100644
|
| --- a/media/filters/video_decoder_selector_unittest.cc
|
| +++ b/media/filters/video_decoder_selector_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/bind.h"
|
| #include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| +#include "base/run_loop.h"
|
| #include "build/build_config.h"
|
| #include "media/base/gmock_callback_support.h"
|
| #include "media/base/mock_filters.h"
|
| @@ -59,9 +60,7 @@ class VideoDecoderSelectorTest : public ::testing::Test {
|
| // InitializeDecoderSelector().
|
| }
|
|
|
| - ~VideoDecoderSelectorTest() {
|
| - message_loop_.RunUntilIdle();
|
| - }
|
| + ~VideoDecoderSelectorTest() { base::RunLoop().RunUntilIdle(); }
|
|
|
| MOCK_METHOD2(OnDecoderSelected,
|
| void(VideoDecoder*, DecryptingDemuxerStream*));
|
| @@ -116,7 +115,7 @@ class VideoDecoderSelectorTest : public ::testing::Test {
|
| base::Unretained(this)),
|
| base::Bind(&VideoDecoderSelectorTest::OnWaitingForDecryptionKey,
|
| base::Unretained(this)));
|
| - message_loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| void SelectDecoderAndDestroy() {
|
| @@ -124,7 +123,7 @@ class VideoDecoderSelectorTest : public ::testing::Test {
|
|
|
| EXPECT_CALL(*this, OnDecoderSelected(IsNull(), IsNull()));
|
| decoder_selector_.reset();
|
| - message_loop_.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| void FrameReady(const scoped_refptr<VideoFrame>& frame) {
|
|
|