Removing DataSource from Filter hierarchy

webkit/media/buffered_data_source.cc

Index: webkit/media/buffered_data_source.cc
diff --git a/webkit/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc
index 8a5feba88a9915ec21d5ca304d67478b3302c3fb..987115da992e223b9b33c7f94324f8afb2e88eb1 100644
--- a/webkit/media/buffered_data_source.cc
+++ b/webkit/media/buffered_data_source.cc
@@ -5,7 +5,6 @@
 #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"
@@ -85,7 +84,7 @@ BufferedResourceLoader* BufferedDataSource::CreateResourceLoader(
                                     media_log_);
 }
 
-void BufferedDataSource::set_host(media::FilterHost* host) {
+void BufferedDataSource::set_host(media::DataSourceHost* host) {
   DataSource::set_host(host);
 
   if (loader_.get()) {
@@ -650,13 +649,13 @@ void BufferedDataSource::UpdateHostState_Locked() {
   // Called from various threads, under lock.
   lock_.AssertAcquired();
 
-  media::FilterHost* filter_host = host();
-  if (!filter_host)
+  media::DataSourceHost* data_source_host = host();

[Ami GONE FROM CHROMIUM, 2011/12/15 18:39:08]

I realize the diff here is mechanical, but you might take the opp to drop the
local variable.

[acolwell GONE FROM CHROMIUM, 2011/12/15 20:57:59]

Done.

+  if (!data_source_host)
     return;
 
   if (total_bytes_ != kPositionNotSpecified)
-    filter_host->SetTotalBytes(total_bytes_);
-  filter_host->SetBufferedBytes(buffered_bytes_);
+    data_source_host->SetTotalBytes(total_bytes_);
+  data_source_host->SetBufferedBytes(buffered_bytes_);
 }
 
 }  // namespace webkit_media