Removing DataSource from Filter hierarchy

webkit/media/buffered_data_source.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 #define WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/filter_factories.h"
-#include "media/base/filters.h"
+#include "media/base/data_source.h"
 #include "webkit/media/buffered_resource_loader.h"
 
 namespace media {
 class MediaLog;
 }
 
 namespace webkit_media {
 
 // This class may be created on any thread, and is callable from the render
 // thread as well as media-specific threads.
 class BufferedDataSource : public WebDataSource {
  public:
   // Creates a DataSourceFactory for building BufferedDataSource objects.
   static media::DataSourceFactory* CreateFactory(
       MessageLoop* render_loop,
       WebKit::WebFrame* frame,
       media::MediaLog* media_log,
       const WebDataSourceBuildObserverHack& build_observer);
 
   BufferedDataSource(MessageLoop* render_loop,
                      WebKit::WebFrame* frame,
                      media::MediaLog* media_log);
 
   virtual ~BufferedDataSource();
 
-  // media::Filter implementation.
-  virtual void set_host(media::FilterHost* host) OVERRIDE;
+  // media::DataSource implementation.
+  // Called from demuxer thread.
+  virtual void set_host(media::DataSourceHost* host) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
 
-  // media::DataSource implementation.
-  // Called from demuxer thread.
   virtual void Read(
       int64 position,
       size_t size,
       uint8* data,
       const media::DataSource::ReadCallback& read_callback) OVERRIDE;
   virtual bool GetSize(int64* size_out) OVERRIDE;
   virtual bool IsStreaming() OVERRIDE;
   virtual void SetPreload(media::Preload preload) OVERRIDE;
   virtual void SetBitrate(int bitrate) OVERRIDE;
 
@@ skipping 166 matching lines @@
   float playback_rate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedDataSource);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_BUFFERED_DATA_SOURCE_H_