Index: media/base/filter_collection.h |
diff --git a/media/base/filter_collection.h b/media/base/filter_collection.h |
index 07266c6b836bfad197ef9126c2045fe94e4515ed..90ea06694469f2d1c6de17db84f276701ebd1da0 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(Demuxer* demuxer); |
+ Demuxer* GetDemuxer(); |
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_; |
+ Demuxer* demuxer_; |
scoped_ptr<AudioRenderer> audio_renderer_; |
scoped_ptr<VideoRenderer> video_renderer_; |