summaryrefslogtreecommitdiffstats
path: root/media/base/pipeline_impl_unittest.cc
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-17 23:33:20 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-17 23:33:20 +0000
commit8621715ceeb4533aca1d27d639cd2e47c33cd961 (patch)
treed9e12a545a5191abacb76a48b02600f3a890d627 /media/base/pipeline_impl_unittest.cc
parenta9d8d382fab207a4216e1789a2635521b7b53389 (diff)
downloadchromium_src-8621715ceeb4533aca1d27d639cd2e47c33cd961.zip
chromium_src-8621715ceeb4533aca1d27d639cd2e47c33cd961.tar.gz
chromium_src-8621715ceeb4533aca1d27d639cd2e47c33cd961.tar.bz2
Refactoring in media::PipelineImpl and media::MediaFilter.
A hack in media::PipelineImpl::BroadcastMessageTask() was previously required to remove the mime_type of the disabled renderer. Since the only use of media::PipelineImpl::BroadcastMessage() is to disable the audio renderer, refactor BroadcastMessage() to DisableAudioRenderer() and refactor media::MediaFilter::OnReceivedMessage() to OnAudioRendererDisabled(). Patch by boliu@google.com: http://codereview.chromium.org/2042014/show BUG=19384 TEST=media_unittests Review URL: http://codereview.chromium.org/2069006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline_impl_unittest.cc')
-rw-r--r--media/base/pipeline_impl_unittest.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 9edae50..86b4e27 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -492,7 +492,7 @@ TEST_F(PipelineImplTest, Properties) {
pipeline_->GetBufferedTime().ToInternalValue());
}
-TEST_F(PipelineImplTest, BroadcastMessage) {
+TEST_F(PipelineImplTest, DisableAudioRenderer) {
CreateAudioStream();
CreateVideoStream();
MockDemuxerStreamVector streams;
@@ -513,20 +513,19 @@ TEST_F(PipelineImplTest, BroadcastMessage) {
EXPECT_TRUE(pipeline_->IsRendered(mime_type::kMajorTypeVideo));
EXPECT_CALL(*mocks_->audio_renderer(), SetPlaybackRate(1.0f))
- .WillOnce(BroadcastMessage(mocks_->audio_renderer(),
- kMsgDisableAudio));
+ .WillOnce(DisableAudioRenderer(mocks_->audio_renderer()));
EXPECT_CALL(*mocks_->data_source(),
- OnReceivedMessage(kMsgDisableAudio));
+ OnAudioRendererDisabled());
EXPECT_CALL(*mocks_->demuxer(),
- OnReceivedMessage(kMsgDisableAudio));
+ OnAudioRendererDisabled());
EXPECT_CALL(*mocks_->audio_decoder(),
- OnReceivedMessage(kMsgDisableAudio));
+ OnAudioRendererDisabled());
EXPECT_CALL(*mocks_->audio_renderer(),
- OnReceivedMessage(kMsgDisableAudio));
+ OnAudioRendererDisabled());
EXPECT_CALL(*mocks_->video_decoder(),
- OnReceivedMessage(kMsgDisableAudio));
+ OnAudioRendererDisabled());
EXPECT_CALL(*mocks_->video_renderer(),
- OnReceivedMessage(kMsgDisableAudio));
+ OnAudioRendererDisabled());
mocks_->audio_renderer()->SetPlaybackRate(1.0f);
}