Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/filters/decoder_base.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.
 
 // A base class that provides the plumbing for a decoder filters.
 
 #ifndef MEDIA_FILTERS_DECODER_BASE_H_
 #define MEDIA_FILTERS_DECODER_BASE_H_
 
 #include <deque>
 
 #include "base/callback.h"
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "media/base/buffers.h"
 #include "media/base/callback.h"
 #include "media/base/filters.h"
 #include "media/base/filter_host.h"
 
 namespace media {
 
 // In this class, we over-specify method lookup via this-> to avoid unexpected
 // name resolution issues due to the two-phase lookup needed for dependent
 // name resolution in templates.
 template <class Decoder, class Output>
 class DecoderBase : public Decoder {
  public:
 
-  // MediaFilter implementation.
+  // Filter implementation.
   virtual void Stop(FilterCallback* callback) {
     this->message_loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &DecoderBase::StopTask, callback));
   }
 
   virtual void Seek(base::TimeDelta time,
                     FilterCallback* callback) {
     this->message_loop()->PostTask(
         FROM_HERE,
@@ skipping 53 matching lines @@
   // the DecoderBase::Initialize() method before any reads are submitted to
   // the demuxer stream.  Returns true if successful, otherwise false indicates
   // a fatal error.  The derived class should NOT call the filter host's
   // InitializationComplete() method.  If this method returns true, then the
   // base class will call the host to complete initialization.  During this
   // call, the derived class must fill in the media_format_ member.
   virtual void DoInitialize(DemuxerStream* demuxer_stream, bool* success,
                             Task* done_cb) = 0;
 
   // Method that may be implemented by the derived class if desired.  It will
-  // be called from within the MediaFilter::Stop() method prior to stopping the
+  // be called from within the Filter::Stop() method prior to stopping the
   // base class.
   virtual void DoStop(Task* done_cb) {
     AutoTaskRunner done_runner(done_cb);
   }
 
   // Derived class can implement this method and perform seeking logic prior
   // to the base class.
   virtual void DoSeek(base::TimeDelta time, Task* done_cb) = 0;
 
   // Method that must be implemented by the derived class.  If the decode
@@ skipping 186 matching lines @@
     kStopped,
   };
   State state_;
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_BASE_H_