Remove reference counting from media::Demuxer and friends.

media/base/pipeline_unittest.cc

Index: media/base/pipeline_unittest.cc
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index 988bb8014d8d7b73c561a259e3128db339e848b1..7029663164fb1e17942476be7a43486f3810ed77 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -85,7 +85,8 @@ class PipelineTest : public ::testing::Test {
                                new MediaLog())),
         filter_collection_(new FilterCollection()) {
     demuxer_ = new MockDemuxer();
-    filter_collection_->SetDemuxer(demuxer_);
+    scoped_ptr<Demuxer> demuxer(demuxer_);
+    filter_collection_->SetDemuxer(demuxer.Pass());
 
     video_renderer_ = new MockVideoRenderer();
     scoped_ptr<VideoRenderer> video_renderer(video_renderer_);
@@ -142,7 +143,7 @@ class PipelineTest : public ::testing::Test {
 
     // Configure the demuxer to return the streams.
     for (size_t i = 0; i < streams->size(); ++i) {
-      scoped_refptr<DemuxerStream> stream((*streams)[i]);
+      DemuxerStream* stream = (*streams)[i];
       EXPECT_CALL(*demuxer_, GetStream(stream->type()))
           .WillRepeatedly(Return(stream));
     }
@@ -153,16 +154,17 @@ class PipelineTest : public ::testing::Test {
     InitializeDemuxer(streams, base::TimeDelta::FromSeconds(10));
   }
 
-  StrictMock<MockDemuxerStream>* CreateStream(DemuxerStream::Type type) {
-    StrictMock<MockDemuxerStream>* stream =
-        new StrictMock<MockDemuxerStream>();
+  scoped_ptr<StrictMock<MockDemuxerStream> > CreateStream(
+      DemuxerStream::Type type) {
+    scoped_ptr<StrictMock<MockDemuxerStream> > stream(
+        new StrictMock<MockDemuxerStream>());
     EXPECT_CALL(*stream, type())
         .WillRepeatedly(Return(type));
-    return stream;
+    return stream.Pass();
   }
 
   // Sets up expectations to allow the video renderer to initialize.
-  void InitializeVideoRenderer(const scoped_refptr<DemuxerStream>& stream) {
+  void InitializeVideoRenderer(DemuxerStream* stream) {
     EXPECT_CALL(*video_renderer_, Initialize(stream, _, _, _, _, _, _, _, _))
         .WillOnce(RunCallback<1>(PIPELINE_OK));
     EXPECT_CALL(*video_renderer_, SetPlaybackRate(0.0f));
@@ -175,7 +177,7 @@ class PipelineTest : public ::testing::Test {
   }
 
   // Sets up expectations to allow the audio renderer to initialize.
-  void InitializeAudioRenderer(const scoped_refptr<DemuxerStream>& stream,
+  void InitializeAudioRenderer(DemuxerStream* stream,
                                bool disable_after_init_cb) {
     if (disable_after_init_cb) {
       EXPECT_CALL(*audio_renderer_, Initialize(stream, _, _, _, _, _, _, _))
@@ -233,11 +235,11 @@ class PipelineTest : public ::testing::Test {
   }
 
   MockDemuxerStream* audio_stream() {
-    return audio_stream_;
+    return audio_stream_.get();
   }
 
   MockDemuxerStream* video_stream() {
-    return video_stream_;
+    return video_stream_.get();
   }
 
   void ExpectSeek(const base::TimeDelta& seek_time) {
@@ -295,11 +297,11 @@ class PipelineTest : public ::testing::Test {
   scoped_refptr<Pipeline> pipeline_;
 
   scoped_ptr<FilterCollection> filter_collection_;
-  scoped_refptr<MockDemuxer> demuxer_;
+  MockDemuxer* demuxer_;
   MockVideoRenderer* video_renderer_;
   MockAudioRenderer* audio_renderer_;
-  scoped_refptr<StrictMock<MockDemuxerStream> > audio_stream_;
-  scoped_refptr<StrictMock<MockDemuxerStream> > video_stream_;
+  scoped_ptr<StrictMock<MockDemuxerStream> > audio_stream_;
+  scoped_ptr<StrictMock<MockDemuxerStream> > video_stream_;
   AudioRenderer::TimeCB audio_time_cb_;
   VideoDecoderConfig video_decoder_config_;