Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/filters/file_data_source.h

 // Copyright (c) 2010 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/lock.h"
 #include "media/base/filters.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 FileDataSource : public DataSource {
  public:
   FileDataSource();
   virtual ~FileDataSource();
 
-  // Implementation of MediaFilter.
+  // Implementation of Filter.
   virtual void Stop(FilterCallback* callback);
 
   // Implementation of DataSource.
   virtual void Initialize(const std::string& url, FilterCallback* callback);
   virtual const MediaFormat& media_format();
   virtual void Read(int64 position, size_t size, uint8* data,
                     ReadCallback* read_callback);
   virtual bool GetSize(int64* size_out);
   virtual bool IsStreaming();
 
@@ skipping 21 matching lines @@
   // that we will block for a short period of time in reads.  Otherwise, we can
   // hang the pipeline Stop.
   Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(FileDataSource);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FILE_DATA_SOURCE_H_