Removing DataSource from Filter hierarchy

webkit/media/buffered_data_source.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.
 
 #include "webkit/media/buffered_data_source.h"
 
 #include "base/bind.h"
-#include "media/base/filter_host.h"
 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 #include "webkit/media/web_data_source_factory.h"
 
 using WebKit::WebFrame;
 
 namespace webkit_media {
 
 // BufferedDataSource has an intermediate buffer, this value governs the initial
 // size of that buffer. It is set to 32KB because this is a typical read size
@@ skipping 59 matching lines @@
 
   return new BufferedResourceLoader(url_,
                                     first_byte_position,
                                     last_byte_position,
                                     ChooseDeferStrategy(),
                                     bitrate_,
                                     playback_rate_,
                                     media_log_);
 }
 
-void BufferedDataSource::set_host(media::FilterHost* host) {
+void BufferedDataSource::set_host(media::DataSourceHost* host) {
   DataSource::set_host(host);
 
   if (loader_.get()) {
     base::AutoLock auto_lock(lock_);
     UpdateHostState_Locked();
   }
 }
 
 void BufferedDataSource::Initialize(const std::string& url,
                                     const media::PipelineStatusCB& callback) {
@@ skipping 544 matching lines @@
 
   buffered_bytes_ = buffered_position + 1;
   if (host())
     host()->SetBufferedBytes(buffered_bytes_);
 }
 
 void BufferedDataSource::UpdateHostState_Locked() {
   // Called from various threads, under lock.
   lock_.AssertAcquired();
 
-  media::FilterHost* filter_host = host();
-  if (!filter_host)
+  if (!host())
     return;
 
   if (total_bytes_ != kPositionNotSpecified)
-    filter_host->SetTotalBytes(total_bytes_);
-  filter_host->SetBufferedBytes(buffered_bytes_);
+    host()->SetTotalBytes(total_bytes_);
+  host()->SetBufferedBytes(buffered_bytes_);
 }
 
 }  // namespace webkit_media