Removing DataSource from Filter hierarchy

media/filters/chunk_demuxer.cc

Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index f81b80f673acb522a5a2a05d7bd64a22fb58edcc..cda484b1eba19b07ee93fbad192f59d3378f9f8a 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -12,7 +12,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "media/base/audio_decoder_config.h"
-#include "media/base/filter_host.h"
 #include "media/base/data_buffer.h"
 #include "media/base/video_decoder_config.h"
 #include "media/ffmpeg/ffmpeg_common.h"
@@ -323,11 +322,11 @@ void ChunkDemuxer::Init(const PipelineStatusCB& cb) {
   client_->DemuxerOpened(this);
 }
 
-void ChunkDemuxer::set_host(FilterHost* filter_host) {
+void ChunkDemuxer::set_host(DemuxerHost* host) {
   DCHECK_EQ(state_, INITIALIZED);
-  Demuxer::set_host(filter_host);
-  filter_host->SetDuration(duration_);
-  filter_host->SetCurrentReadPosition(0);
+  Demuxer::set_host(host);
+  host->SetDuration(duration_);
+  host->SetCurrentReadPosition(0);
 }
 
 void ChunkDemuxer::Stop(const base::Closure& callback) {
@@ -811,7 +810,7 @@ void ChunkDemuxer::ReportError_Locked(PipelineStatus error) {
   {
     base::AutoUnlock auto_unlock(lock_);
     if (cb.is_null()) {
-      host()->SetError(error);
+      host()->OnDemuxerError(error);
       return;
     }
     cb.Run(error);