Remove reference counting from media::Demuxer and friends.

media/filters/decrypting_audio_decoder_unittest.cc

Index: media/filters/decrypting_audio_decoder_unittest.cc
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index 39d30d4ec9d329293652e1be3ac75cd58de930d9..60bbb5ca9f2b15016b79871c8b5ccd0224ac8e16 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -95,7 +95,7 @@ class DecryptingAudioDecoderTest : public testing::Test {
     EXPECT_CALL(*demuxer_, audio_decoder_config())
         .WillRepeatedly(ReturnRef(config));
 
-    decoder_->Initialize(demuxer_, NewExpectedStatusCB(status),
+    decoder_->Initialize(demuxer_.get(), NewExpectedStatusCB(status),
                          base::Bind(&MockStatisticsCB::OnStatistics,
                                     base::Unretained(&statistics_cb_)));
     message_loop_.RunUntilIdle();
@@ -222,7 +222,7 @@ class DecryptingAudioDecoderTest : public testing::Test {
   MessageLoop message_loop_;
   scoped_ptr<DecryptingAudioDecoder> decoder_;
   scoped_ptr<StrictMock<MockDecryptor> > decryptor_;
-  scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_;
+  scoped_ptr<StrictMock<MockDemuxerStream> > demuxer_;

[acolwell GONE FROM CHROMIUM, 2013/04/17 20:24:53]

Perhaps change this to not be a pointer in a followup CL?

[scherkus (not reviewing), 2013/04/19 01:07:22]

As discussed offline -- follow up CLs are needed for scoped_ptr<T> -> T
conversions.

   MockStatisticsCB statistics_cb_;
   AudioDecoderConfig config_;