Remove reference counting from media::Demuxer and friends.

media/base/filter_collection.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 namespace media {
 
 class AudioRenderer;
 class Demuxer;
 class VideoRenderer;
 
 // Represents a set of uninitialized demuxer and audio/video decoders and
 // renderers. Used to start a Pipeline object for media playback.
 //
 // TODO(scherkus): Replace FilterCollection with something sensible, see
 // http://crbug.com/110800
 class MEDIA_EXPORT FilterCollection {
  public:
   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();
 
   void SetVideoRenderer(scoped_ptr<VideoRenderer> video_renderer);
   scoped_ptr<VideoRenderer> GetVideoRenderer();
 
  private:
-  scoped_refptr<Demuxer> demuxer_;
+  scoped_ptr<Demuxer> demuxer_;
   scoped_ptr<AudioRenderer> audio_renderer_;
   scoped_ptr<VideoRenderer> video_renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(FilterCollection);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTER_COLLECTION_H_