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

Unified Diff: media/filters/audio_renderer_impl_unittest.cc

Issue 14217008: Remove reference counting from media::DemuxerStream and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 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
Index: media/filters/audio_renderer_impl_unittest.cc
diff --git a/media/filters/audio_renderer_impl_unittest.cc b/media/filters/audio_renderer_impl_unittest.cc
index 2a3fef14bb0953fb8628b14f93872c4bb4c2a166..cb8024e264323f9fd8c6f59f8ec436ef6ef2ffa3 100644
--- a/media/filters/audio_renderer_impl_unittest.cc
+++ b/media/filters/audio_renderer_impl_unittest.cc
@@ -39,13 +39,12 @@ class AudioRendererImplTest : public ::testing::Test {
public:
// Give the decoder some non-garbage media properties.
AudioRendererImplTest()
- : demuxer_stream_(new MockDemuxerStream()),
- decoder_(new MockAudioDecoder()),
+ : decoder_(new MockAudioDecoder()),
audio_config_(kCodecVorbis, kSampleFormatPlanarF32,
CHANNEL_LAYOUT_STEREO, 44100, NULL, 0, false) {
- EXPECT_CALL(*demuxer_stream_, type())
+ EXPECT_CALL(demuxer_stream_, type())
.WillRepeatedly(Return(DemuxerStream::AUDIO));
- EXPECT_CALL(*demuxer_stream_, audio_decoder_config())
+ EXPECT_CALL(demuxer_stream_, audio_decoder_config())
.WillRepeatedly(ReturnRef(audio_config_));
// Used to save callbacks and run them at a later time.
@@ -123,7 +122,7 @@ class AudioRendererImplTest : public ::testing::Test {
WaitableMessageLoopEvent event;
renderer_->Initialize(
- demuxer_stream_,
+ &demuxer_stream_,
event.GetPipelineStatusCB(),
base::Bind(&AudioRendererImplTest::OnStatistics,
base::Unretained(this)),
@@ -366,7 +365,7 @@ class AudioRendererImplTest : public ::testing::Test {
base::ResetAndReturn(&read_cb_).Run(status, buffer);
}
- scoped_refptr<MockDemuxerStream> demuxer_stream_;
+ MockDemuxerStream demuxer_stream_;
MockAudioDecoder* decoder_;
// Used for stubbing out time in the audio callback thread.

Powered by Google App Engine
This is Rietveld 408576698