Remove reference counting from media::Demuxer and friends.

media/base/mock_filters.h

Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 56b523a65e7b6a82ecda6584f5c2b63fecce4c9f..5dd4c98f0933284a1d29f0e51da881e09be0ec0e 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -27,6 +27,7 @@ namespace media {
 class MockDemuxer : public Demuxer {
  public:
   MockDemuxer();
+  virtual ~MockDemuxer();
 
   // Demuxer implementation.
   MOCK_METHOD2(Initialize, void(DemuxerHost* host, const PipelineStatusCB& cb));
@@ -34,12 +35,9 @@ class MockDemuxer : public Demuxer {
   MOCK_METHOD2(Seek, void(base::TimeDelta time, const PipelineStatusCB& cb));
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
-  MOCK_METHOD1(GetStream, scoped_refptr<DemuxerStream>(DemuxerStream::Type));
+  MOCK_METHOD1(GetStream, DemuxerStream*(DemuxerStream::Type));
   MOCK_CONST_METHOD0(GetStartTime, base::TimeDelta());
 
- protected:
-  virtual ~MockDemuxer();
-
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDemuxer);
 };
@@ -47,6 +45,7 @@ class MockDemuxer : public Demuxer {
 class MockDemuxerStream : public DemuxerStream {
  public:
   MockDemuxerStream();
+  virtual ~MockDemuxerStream();
 
   // DemuxerStream implementation.
   MOCK_METHOD0(type, Type());
@@ -55,9 +54,6 @@ class MockDemuxerStream : public DemuxerStream {
   MOCK_METHOD0(video_decoder_config, const VideoDecoderConfig&());
   MOCK_METHOD0(EnableBitstreamConverter, void());
 
- protected:
-  virtual ~MockDemuxerStream();
-
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream);
 };
@@ -65,9 +61,10 @@ class MockDemuxerStream : public DemuxerStream {
 class MockVideoDecoder : public VideoDecoder {
  public:
   MockVideoDecoder();
+  virtual ~MockVideoDecoder();
 
   // VideoDecoder implementation.
-  MOCK_METHOD3(Initialize, void(const scoped_refptr<DemuxerStream>&,
+  MOCK_METHOD3(Initialize, void(DemuxerStream*,
                                 const PipelineStatusCB&,
                                 const StatisticsCB&));
   MOCK_METHOD1(Read, void(const ReadCB&));
@@ -75,9 +72,6 @@ class MockVideoDecoder : public VideoDecoder {
   MOCK_METHOD1(Stop, void(const base::Closure&));
   MOCK_CONST_METHOD0(HasAlpha, bool());
 
- protected:
-  virtual ~MockVideoDecoder();
-
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoDecoder);
 };
@@ -85,9 +79,10 @@ class MockVideoDecoder : public VideoDecoder {
 class MockAudioDecoder : public AudioDecoder {
  public:
   MockAudioDecoder();
+  virtual ~MockAudioDecoder();
 
   // AudioDecoder implementation.
-  MOCK_METHOD3(Initialize, void(const scoped_refptr<DemuxerStream>&,
+  MOCK_METHOD3(Initialize, void(DemuxerStream*,
                                 const PipelineStatusCB&,
                                 const StatisticsCB&));
   MOCK_METHOD1(Read, void(const ReadCB&));
@@ -96,9 +91,6 @@ class MockAudioDecoder : public AudioDecoder {
   MOCK_METHOD0(samples_per_second, int(void));
   MOCK_METHOD1(Reset, void(const base::Closure&));
 
- protected:
-  virtual ~MockAudioDecoder();
-
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioDecoder);
 };
@@ -109,7 +101,7 @@ class MockVideoRenderer : public VideoRenderer {
   virtual ~MockVideoRenderer();
 
   // VideoRenderer implementation.
-  MOCK_METHOD9(Initialize, void(const scoped_refptr<DemuxerStream>& stream,
+  MOCK_METHOD9(Initialize, void(DemuxerStream* stream,
                                 const PipelineStatusCB& init_cb,
                                 const StatisticsCB& statistics_cb,
                                 const TimeCB& time_cb,
@@ -135,7 +127,7 @@ class MockAudioRenderer : public AudioRenderer {
   virtual ~MockAudioRenderer();
 
   // AudioRenderer implementation.
-  MOCK_METHOD8(Initialize, void(const scoped_refptr<DemuxerStream>& stream,
+  MOCK_METHOD8(Initialize, void(DemuxerStream* stream,
                                 const PipelineStatusCB& init_cb,
                                 const StatisticsCB& statistics_cb,
                                 const base::Closure& underflow_cb,