Remove reference counting from media::Demuxer and friends.

media/base/filter_collection.cc

Index: media/base/filter_collection.cc
diff --git a/media/base/filter_collection.cc b/media/base/filter_collection.cc
index 911edd5832cd6150b57283af53f80eeed9df8f9a..730835f1919894e67421fb70077171526a1ed4f2 100644
--- a/media/base/filter_collection.cc
+++ b/media/base/filter_collection.cc
@@ -4,22 +4,21 @@
 
 #include "media/base/filter_collection.h"
 
-#include "base/logging.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/demuxer.h"
 #include "media/base/video_renderer.h"
 
 namespace media {
 
-FilterCollection::FilterCollection() {}
+FilterCollection::FilterCollection() : demuxer_(NULL) {}
 
 FilterCollection::~FilterCollection() {}
 
-void FilterCollection::SetDemuxer(const scoped_refptr<Demuxer>& demuxer) {
+void FilterCollection::SetDemuxer(Demuxer* demuxer) {
   demuxer_ = demuxer;
 }
 
-const scoped_refptr<Demuxer>& FilterCollection::GetDemuxer() {
+Demuxer* FilterCollection::GetDemuxer() {
   return demuxer_;
 }