Removing DataSource from Filter hierarchy

media/filters/file_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 MEDIA_FILTERS_FILE_DATA_SOURCE_H_
 #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/synchronization/lock.h"
-#include "media/base/filters.h"
+#include "media/base/data_source.h"
 
 namespace media {
 
 // Basic data source that treats the URL as a file path, and uses the file
 // system to read data for a media pipeline.
 class MEDIA_EXPORT FileDataSource : public DataSource {
  public:
   FileDataSource();
   FileDataSource(bool disable_file_size);
   virtual ~FileDataSource();
 
   PipelineStatus Initialize(const std::string& url);
 
-  // Implementation of Filter.
-  virtual void set_host(FilterHost* filter_host) OVERRIDE;
+  // Implementation of DataSource.
+  virtual void set_host(DataSourceHost* host) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
-
-  // Implementation of DataSource.
   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(Preload preload) OVERRIDE;
   virtual void SetBitrate(int bitrate) OVERRIDE;
 
  private:
   // Only allow factories and tests to create this object.
   //
@@ skipping 22 matching lines @@
   // that we will block for a short period of time in reads.  Otherwise, we can
   // hang the pipeline Stop.
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(FileDataSource);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FILE_DATA_SOURCE_H_