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

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
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 3a06f1d6e5ee4c772fcd013af35d10b36659032e..72ef6ce1ba00bc4d0aa97430b1b46917a863a55a 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -90,7 +90,7 @@ class DecryptingDemuxerStreamTest : public testing::Test {
EXPECT_CALL(*input_audio_stream_, type())
.WillRepeatedly(Return(DemuxerStream::AUDIO));
- demuxer_stream_->Initialize(input_audio_stream_,
+ demuxer_stream_->Initialize(input_audio_stream_.get(),
NewExpectedStatusCB(status));
message_loop_.RunUntilIdle();
}
@@ -102,7 +102,7 @@ class DecryptingDemuxerStreamTest : public testing::Test {
EXPECT_CALL(*input_video_stream_, type())
.WillRepeatedly(Return(DemuxerStream::VIDEO));
- demuxer_stream_->Initialize(input_video_stream_,
+ demuxer_stream_->Initialize(input_video_stream_.get(),
NewExpectedStatusCB(status));
message_loop_.RunUntilIdle();
}
@@ -220,10 +220,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_;

Powered by Google App Engine
This is Rietveld 408576698