Chromium Code Reviews| Index: media/test/pipeline_integration_test.cc |
| diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc |
| index 2cd26bd8431ad268ee157359f97459347b75dfd3..7ca3894ca7f839bcc66779e4fc654d25b9de1701 100644 |
| --- a/media/test/pipeline_integration_test.cc |
| +++ b/media/test/pipeline_integration_test.cc |
| @@ -14,6 +14,7 @@ |
| #include "base/macros.h" |
| #include "base/memory/ptr_util.h" |
| #include "base/memory/ref_counted.h" |
| +#include "base/run_loop.h" |
| #include "base/single_thread_task_runner.h" |
| #include "base/strings/string_split.h" |
| #include "base/strings/string_util.h" |
| @@ -789,7 +790,7 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost { |
| base::Bind(&FakeEncryptedMedia::OnEncryptedMediaInitData, |
| base::Unretained(encrypted_media))); |
| } |
| - message_loop_.Run(); |
|
gab
2016/06/30 20:28:18
Feels a bit weird to replace a member call by a st
fdoray
2016/07/04 13:59:46
MessageLoop::Run() and MessageLoop::RunUntilIdle()
gab
2016/07/04 14:47:06
Hmm I don't think there's precedent for such a pre
fdoray
2016/07/04 16:33:59
Will document the desired paradigm in a separate C
|
| + base::RunLoop().Run(); |
| return pipeline_status_; |
| } |
| @@ -1250,7 +1251,7 @@ TEST_F(PipelineIntegrationTest, MediaSource_Remove_Updates_BufferedRanges) { |
| source.RemoveRange(base::TimeDelta::FromMilliseconds(1000), |
| base::TimeDelta::FromMilliseconds(k320WebMFileDurationMs)); |
| - message_loop_.RunUntilIdle(); |
| + base::RunLoop().RunUntilIdle(); |
| buffered_ranges = pipeline_->GetBufferedTimeRanges(); |
| EXPECT_EQ(1u, buffered_ranges.size()); |
| @@ -1286,7 +1287,7 @@ TEST_F(PipelineIntegrationTest, MediaSource_FillUp_Buffer) { |
| source.EvictCodedFrames(media_time, file->data_size()); |
| ASSERT_TRUE( |
| source.AppendAtTime(media_time, file->data(), file->data_size())); |
| - message_loop_.RunUntilIdle(); |
| + base::RunLoop().RunUntilIdle(); |
| buffered_ranges = pipeline_->GetBufferedTimeRanges(); |
| } while (buffered_ranges.size() == 1 && |
| @@ -1343,7 +1344,7 @@ TEST_F(PipelineIntegrationTest, |
| source.EndOfStream(); |
| - message_loop_.Run(); |
| + base::RunLoop().Run(); |
| EXPECT_EQ(CHUNK_DEMUXER_ERROR_APPEND_FAILED, pipeline_status_); |
| EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size()); |