Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

chrome/renderer/media/ipc_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 CHROME_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_
 #define CHROME_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_
 
 #include "base/time.h"
 #include "media/base/pts_heap.h"
 #include "media/base/video_frame.h"
 #include "media/filters/decoder_base.h"
 #include "media/video/video_decode_engine.h"
 #include "media/video/video_decode_context.h"
 
 struct AVRational;
 
 namespace ggl {
 class Context;
 }  // namespace ggl
 
 class IpcVideoDecoder : public media::VideoDecoder,
                         public media::VideoDecodeEngine::EventHandler {
  public:
   IpcVideoDecoder(MessageLoop* message_loop, ggl::Context* ggl_context);
   virtual ~IpcVideoDecoder();
 
-  // MediaFilter implementation.
+  // media::Filter implementation.
   virtual void Stop(media::FilterCallback* callback);
   virtual void Seek(base::TimeDelta time, media::FilterCallback* callback);
   virtual void Pause(media::FilterCallback* callback);
   virtual void Flush(media::FilterCallback* callback);
 
-  // Decoder implementation.
+  // media::VideoDecoder implementation.
   virtual void Initialize(media::DemuxerStream* demuxer_stream,
                           media::FilterCallback* callback);
   virtual const media::MediaFormat& media_format() { return media_format_; }
   virtual void ProduceVideoFrame(scoped_refptr<media::VideoFrame> video_frame);
 
   // TODO(hclam): Remove this method.
   virtual bool ProvidesBuffer() { return true; }
 
-  // VideoDecodeEngine::EventHandler implementation.
+  // media::VideoDecodeEngine::EventHandler implementation.
   virtual void OnInitializeComplete(const media::VideoCodecInfo& info);
   virtual void OnUninitializeComplete();
   virtual void OnFlushComplete();
   virtual void OnSeekComplete();
   virtual void OnError();
 
   // TODO(hclam): Remove this method.
   virtual void OnFormatChange(media::VideoStreamInfo stream_info) {}
   virtual void ProduceVideoSample(scoped_refptr<media::Buffer> buffer);
   virtual void ConsumeVideoFrame(scoped_refptr<media::VideoFrame> frame);
@@ skipping 29 matching lines @@
   // avoid dead lock during tear down of the media pipeline.
   scoped_ptr<media::VideoDecodeEngine> decode_engine_;
 
   // Decoding context to be used by VideoDecodeEngine.
   scoped_ptr<media::VideoDecodeContext> decode_context_;
 
   DISALLOW_COPY_AND_ASSIGN(IpcVideoDecoder);
 };
 
 #endif  // CHROME_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_