Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/filters/omx_video_decoder.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_OMX_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_OMX_VIDEO_DECODER_H_
 
 #include <queue>
 
 #include "media/base/filters.h"
 #include "media/base/media_format.h"
 #include "media/video/video_decode_context.h"
 #include "media/video/video_decode_engine.h"
 
 class MessageLoop;
 
 namespace media {
 
 class Buffer;
 class OmxVideoDecodeEngine;
 class VideoFrame;
 
 class OmxVideoDecoder : public VideoDecoder,
                         public VideoDecodeEngine::EventHandler {
  public:
   explicit OmxVideoDecoder(VideoDecodeContext* decode_context);
   virtual ~OmxVideoDecoder();
 
-  // MediaFilter implementations.
+  // Filter implementations.
   virtual void Initialize(DemuxerStream* stream, FilterCallback* callback);
   virtual void Stop(FilterCallback* callback);
   virtual void Flush(FilterCallback* callback);
   virtual void Seek(base::TimeDelta time, FilterCallback* callback);
   virtual void ProduceVideoFrame(scoped_refptr<VideoFrame> frame);
   virtual bool ProvidesBuffer();
   virtual const MediaFormat& media_format() { return media_format_; }
 
  private:
   // VideoDecodeEngine::EventHandler interface.
@@ skipping 24 matching lines @@
   scoped_ptr<FilterCallback> seek_callback_;
 
   VideoCodecInfo info_;
 
   DISALLOW_COPY_AND_ASSIGN(OmxVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_OMX_VIDEO_DECODER_H_