Removing DataSource from Filter hierarchy

media/filters/chunk_demuxer.cc

 // Copyright (c) 2011 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.
 
 // Implements a Demuxer that can switch among different data sources mid-stream.
 // Uses FFmpegDemuxer under the covers, so see the caveats at the top of
 // ffmpeg_demuxer.h.
 
 #include "media/filters/chunk_demuxer.h"
 
 #include "base/bind.h"
 #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"
 #include "media/filters/chunk_demuxer_client.h"
 #include "media/filters/ffmpeg_glue.h"
 #include "media/filters/in_memory_url_protocol.h"
 #include "media/webm/webm_cluster_parser.h"
 #include "media/webm/webm_constants.h"
 #include "media/webm/webm_info_parser.h"
 #include "media/webm/webm_tracks_parser.h"
@@ skipping 290 matching lines @@
     base::AutoLock auto_lock(lock_);
     DCHECK_EQ(state_, WAITING_FOR_INIT);
 
     ChangeState_Locked(INITIALIZING);
     init_cb_ = 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) {
   VLOG(1) << "Stop()";
   Shutdown();
   callback.Run();
 }
 
 void ChunkDemuxer::Seek(base::TimeDelta time, const PipelineStatusCB& cb) {
   VLOG(1) << "Seek(" << time.InSecondsF() << ")";
@@ skipping 463 matching lines @@
     if (audio_.get())
       audio_->Shutdown();
 
     if (video_.get())
       video_->Shutdown();
   }
 
   {
     base::AutoUnlock auto_unlock(lock_);
     if (cb.is_null()) {
-      host()->SetError(error);
+      host()->OnDemuxerError(error);
       return;
     }
     cb.Run(error);
   }
 }
 
 }  // namespace media