Remove reference counting from media::Demuxer and friends.

media/filters/video_renderer_base_unittest.cc

Index: media/filters/video_renderer_base_unittest.cc
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index 4ce9f080807f1faec0f9562ab8bd9f876aa24aec..a18a91275c6933e70b5dd05bc795286a566b7a1b 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -42,7 +42,6 @@ class VideoRendererBaseTest : public ::testing::Test {
  public:
   VideoRendererBaseTest()
       : decoder_(new MockVideoDecoder()),
-        demuxer_stream_(new MockDemuxerStream()),
         video_config_(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, kVideoFormat,
                       kCodedSize, kVisibleRect, kNaturalSize, NULL, 0, false) {
     ScopedVector<VideoDecoder> decoders;
@@ -56,9 +55,9 @@ class VideoRendererBaseTest : public ::testing::Test {
         base::Bind(&VideoRendererBaseTest::OnSetOpaque, base::Unretained(this)),
         true));
 
-    EXPECT_CALL(*demuxer_stream_, type())
+    EXPECT_CALL(demuxer_stream_, type())
         .WillRepeatedly(Return(DemuxerStream::VIDEO));
-    EXPECT_CALL(*demuxer_stream_, video_decoder_config())
+    EXPECT_CALL(demuxer_stream_, video_decoder_config())
         .WillRepeatedly(ReturnRef(video_config_));
 
     // We expect these to be called but we don't care how/when.
@@ -123,7 +122,7 @@ class VideoRendererBaseTest : public ::testing::Test {
 
   void CallInitialize(const PipelineStatusCB& status_cb) {
     renderer_->Initialize(
-        demuxer_stream_,
+        &demuxer_stream_,
         status_cb,
         base::Bind(&MockStatisticsCB::OnStatistics,
                    base::Unretained(&statistics_cb_object_)),
@@ -297,7 +296,7 @@ class VideoRendererBaseTest : public ::testing::Test {
   // Fixture members.
   scoped_ptr<VideoRendererBase> renderer_;
   MockVideoDecoder* decoder_;  // Owned by |renderer_|.
-  scoped_refptr<MockDemuxerStream> demuxer_stream_;
+  MockDemuxerStream demuxer_stream_;
   MockStatisticsCB statistics_cb_object_;
 
  private: