Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/filters/decoder_base_unittest.cc

 // 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.
 
 #include <vector>
 
 #include "media/base/mock_filters.h"
 #include "media/base/mock_task.h"
 #include "media/filters/decoder_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 21 matching lines @@
  public:
   MockBuffer() {}
   virtual ~MockBuffer() {}
   MOCK_CONST_METHOD0(GetData, const uint8*());
   MOCK_CONST_METHOD0(GetDataSize, size_t());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockBuffer);
 };
 
-class MockDecoder : public media::MediaFilter {
+class MockDecoder : public media::Filter {
  public:
   typedef Callback1<scoped_refptr<MockDecoderOutput> >::Type
       ConsumeAudioSamplesCallback;
   void set_consume_audio_samples_callback(
       ConsumeAudioSamplesCallback* callback) {
     consume_audio_samples_callback_.reset(callback);
   }
   ConsumeAudioSamplesCallback* consume_audio_samples_callback() {
     return consume_audio_samples_callback_.get();
   }
@@ skipping 104 matching lines @@
   // Stop.
   EXPECT_CALL(*decoder, DoStop(_))
       .WillOnce(WithArg<0>(InvokeRunnable()));
   EXPECT_CALL(callback, OnFilterCallback());
   EXPECT_CALL(callback, OnCallbackDestroyed());
   decoder->Stop(callback.NewCallback());
   message_loop.RunAllPending();
 }
 
 }  // namespace media