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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2132593002: Remove remaining calls to deprecated MessageLoop methods on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: h264_vt_encoder_unittest.cc Created 4 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/filters/ffmpeg_demuxer_unittest.cc ('k') | net/proxy/proxy_config_service_android_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index b3c7349bd67b258cb653a654e345a1f456ea5b8a..197cfe5cc7159a7c4108cd7e0a35bf3bdf73b544 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -10,12 +10,10 @@
#include "base/bind.h"
#include "base/command_line.h"
-#include "base/location.h"
#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"
#include "base/threading/thread_task_runner_handle.h"
@@ -952,7 +950,7 @@ TEST_F(PipelineIntegrationTest, PlaybackWithAudioTrackDisabledThenEnabled) {
// Disable audio.
std::vector<MediaTrack::Id> empty;
pipeline_->OnEnabledAudioTracksChanged(empty);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Seek to flush the pipeline and ensure there's no prerolled audio data.
ASSERT_TRUE(Seek(base::TimeDelta()));
@@ -969,7 +967,7 @@ TEST_F(PipelineIntegrationTest, PlaybackWithAudioTrackDisabledThenEnabled) {
std::vector<MediaTrack::Id> audioTrackId;
audioTrackId.push_back("2");
pipeline_->OnEnabledAudioTracksChanged(audioTrackId);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Restart playback from 500ms position.
ASSERT_TRUE(Seek(k500ms));
@@ -986,7 +984,7 @@ TEST_F(PipelineIntegrationTest, PlaybackWithVideoTrackDisabledThenEnabled) {
// Disable video.
std::vector<MediaTrack::Id> empty;
pipeline_->OnSelectedVideoTrackChanged(empty);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Seek to flush the pipeline and ensure there's no prerolled video data.
ASSERT_TRUE(Seek(base::TimeDelta()));
@@ -1007,7 +1005,7 @@ TEST_F(PipelineIntegrationTest, PlaybackWithVideoTrackDisabledThenEnabled) {
std::vector<MediaTrack::Id> videoTrackId;
videoTrackId.push_back("1");
pipeline_->OnSelectedVideoTrackChanged(videoTrackId);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Seek to flush video pipeline and reset the video hash again to clear state
// if some prerolled frames got hashed after enabling video.
@@ -1761,7 +1759,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());
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | net/proxy/proxy_config_service_android_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698