Index: media/filters/audio_decoder_selector_unittest.cc |
diff --git a/media/filters/audio_decoder_selector_unittest.cc b/media/filters/audio_decoder_selector_unittest.cc |
index d3532e4926223a4411326ed0675b02420c5b68af..45942f37111b739494f0bd8e43725cd21897f067 100644 |
--- a/media/filters/audio_decoder_selector_unittest.cc |
+++ b/media/filters/audio_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/media_util.h" |
@@ -61,9 +62,7 @@ class AudioDecoderSelectorTest : public ::testing::Test { |
// InitializeDecoderSelector(). |
} |
- ~AudioDecoderSelectorTest() { |
- message_loop_.RunUntilIdle(); |
- } |
+ ~AudioDecoderSelectorTest() { base::RunLoop().RunUntilIdle(); } |
MOCK_METHOD2(OnDecoderSelected, |
void(AudioDecoder*, DecryptingDemuxerStream*)); |
@@ -121,7 +120,7 @@ class AudioDecoderSelectorTest : public ::testing::Test { |
base::Unretained(this)), |
base::Bind(&AudioDecoderSelectorTest::OnDecoderOutput), |
base::Bind(&AudioDecoderSelectorTest::OnWaitingForDecryptionKey)); |
- message_loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
} |
void SelectDecoderAndDestroy() { |
@@ -129,7 +128,7 @@ class AudioDecoderSelectorTest : public ::testing::Test { |
EXPECT_CALL(*this, OnDecoderSelected(IsNull(), IsNull())); |
decoder_selector_.reset(); |
- message_loop_.RunUntilIdle(); |
+ base::RunLoop().RunUntilIdle(); |
} |
static void OnDecoderOutput(const scoped_refptr<AudioBuffer>& output) { |