Removing DataSource from Filter hierarchy

webkit/media/simple_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.
 
 // An extremely simple implementation of DataSource that downloads the entire
 // media resource into memory before signaling that initialization has finished.
 // Primarily used to test <audio> and <video> with buffering/caching removed
 // from the equation.
 
 #ifndef WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_
 #define WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_
 
 #include <algorithm>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "media/base/filter_factories.h"
-#include "media/base/filters.h"
+#include "media/base/data_source.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLResponse.h"
 #include "webkit/media/web_data_source.h"
 
 class MessageLoop;
 
 namespace media {
 class MediaLog;
 }
 
 namespace webkit_media {
 
 class SimpleDataSource
     : public WebDataSource,
       public WebKit::WebURLLoaderClient {
  public:
   // Creates a DataSourceFactory for building SimpleDataSource objects.
   static media::DataSourceFactory* CreateFactory(
       MessageLoop* render_loop,
       WebKit::WebFrame* frame,
       media::MediaLog* media_log,
       const WebDataSourceBuildObserverHack& build_observer);
 
   SimpleDataSource(MessageLoop* render_loop, WebKit::WebFrame* frame);
   virtual ~SimpleDataSource();
 
-  // media::Filter implementation.
-  virtual void set_host(media::FilterHost* host) OVERRIDE;
+  // media::DataSource implementation.
+  virtual void set_host(media::DataSourceHost* host) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
-
-  // media::DataSource implementation.
   virtual void Read(int64 position,
                     size_t size,
                     uint8* data,
                     const 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;
 
   // Used to inject a mock used for unittests.
@@ skipping 80 matching lines @@
 
   // Used to ensure mocks for unittests are used instead of reset in Start().
   bool keep_test_loader_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleDataSource);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_SIMPLE_DATA_SOURCE_H_