Remove reference counting from media::Demuxer and friends.

media/base/filter_collection.h

Index: media/base/filter_collection.h
diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h
index 07266c6b836bfad197ef9126c2045fe94e4515ed..4b1a2197b784d8e60460d790c425405f821819cd 100644
--- a/media/base/filter_collection.h
+++ b/media/base/filter_collection.h
@@ -5,7 +5,6 @@
 #ifndef MEDIA_BASE_FILTER_COLLECTION_H_
 #define MEDIA_BASE_FILTER_COLLECTION_H_
 
-#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
 
@@ -25,8 +24,8 @@ class MEDIA_EXPORT FilterCollection {
   FilterCollection();
   ~FilterCollection();
 
-  void SetDemuxer(const scoped_refptr<Demuxer>& demuxer);
-  const scoped_refptr<Demuxer>& GetDemuxer();
+  void SetDemuxer(scoped_ptr<Demuxer> demuxer);
+  scoped_ptr<Demuxer> GetDemuxer();

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

nit: Add comment indicating that this passes ownership and can only be called
once for every SetDemuxer() call?

This isn't a normal getter so perhaps something other than Get should be used?
Acquire, Adopt, Extract, GetAndClear, ResetAndReturn, etc

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

xhwang@ and fischman@ discussed this when I did the changes for audio/video
renderers

consensus was it wasn't worth it and scoped_ptr<T> is a strong-enough signal

I'm really indifferent but if I had to choose I'd go with something pithy
(RemoveXXX, given this is a "collection"?)

 
   void SetAudioRenderer(scoped_ptr<AudioRenderer> audio_renderer);
   scoped_ptr<AudioRenderer> GetAudioRenderer();
@@ -35,7 +34,7 @@ class MEDIA_EXPORT FilterCollection {
   scoped_ptr<VideoRenderer> GetVideoRenderer();
 
  private:
-  scoped_refptr<Demuxer> demuxer_;
+  scoped_ptr<Demuxer> demuxer_;
   scoped_ptr<AudioRenderer> audio_renderer_;
   scoped_ptr<VideoRenderer> video_renderer_;