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

Unified Diff: media/filters/decrypting_demuxer_stream_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
« no previous file with comments | « media/filters/decrypting_demuxer_stream.cc ('k') | media/filters/decrypting_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_demuxer_stream_unittest.cc
diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc
index 4a73172ff1b0484d601e6593348c246a2fc5517e..9258b91cc9ec3cf1089a04ab54195127aa76ed69 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -87,7 +87,7 @@ class DecryptingDemuxerStreamTest : public testing::Test {
void InitializeAudioAndExpectStatus(const AudioDecoderConfig& config,
PipelineStatus status) {
input_audio_stream_->set_audio_decoder_config(config);
- demuxer_stream_->Initialize(input_audio_stream_,
+ demuxer_stream_->Initialize(input_audio_stream_.get(),
NewExpectedStatusCB(status));
message_loop_.RunUntilIdle();
}
@@ -95,7 +95,7 @@ class DecryptingDemuxerStreamTest : public testing::Test {
void InitializeVideoAndExpectStatus(const VideoDecoderConfig& config,
PipelineStatus status) {
input_video_stream_->set_video_decoder_config(config);
- demuxer_stream_->Initialize(input_video_stream_,
+ demuxer_stream_->Initialize(input_video_stream_.get(),
NewExpectedStatusCB(status));
message_loop_.RunUntilIdle();
}
@@ -213,10 +213,10 @@ class DecryptingDemuxerStreamTest : public testing::Test {
const scoped_refptr<DecoderBuffer>&));
base::MessageLoop message_loop_;
- scoped_refptr<DecryptingDemuxerStream> demuxer_stream_;
+ scoped_ptr<DecryptingDemuxerStream> demuxer_stream_;
scoped_ptr<StrictMock<MockDecryptor> > decryptor_;
- scoped_refptr<StrictMock<MockDemuxerStream> > input_audio_stream_;
- scoped_refptr<StrictMock<MockDemuxerStream> > input_video_stream_;
+ scoped_ptr<StrictMock<MockDemuxerStream> > input_audio_stream_;
+ scoped_ptr<StrictMock<MockDemuxerStream> > input_video_stream_;
DemuxerStream::ReadCB pending_demuxer_read_cb_;
Decryptor::NewKeyCB key_added_cb_;
« no previous file with comments | « media/filters/decrypting_demuxer_stream.cc ('k') | media/filters/decrypting_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698