Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/base/mock_filters.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 new breed of mock media filters, this time using gmock!  Feel free to add
 // actions if you need interesting side-effects (i.e., copying data to the
 // buffer passed into MockDataSource::Read()).
 //
 // Don't forget you can use StrictMock<> and NiceMock<> if you want the mock
 // filters to fail the test or do nothing when an unexpected method is called.
 // http://code.google.com/p/googlemock/wiki/CookBook#Nice_Mocks_and_Strict_Mocks
 
 #ifndef MEDIA_BASE_MOCK_FILTERS_H_
 #define MEDIA_BASE_MOCK_FILTERS_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "media/base/filters.h"
-#include "media/base/media_filter_collection.h"
+#include "media/base/filter_collection.h"
 #include "media/base/video_frame.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
 
 // Use this template to test for object destruction by setting expectations on
 // the method OnDestroy().
 //
 // TODO(scherkus): not sure about the naming...  perhaps contribute this back
 // to gmock itself!
@@ skipping 56 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(CallbackImpl);
   };
 
   DISALLOW_COPY_AND_ASSIGN(MockFilterCallback);
 };
 
 class MockDataSource : public DataSource {
  public:
   MockDataSource() {}
 
-  // MediaFilter implementation.
+  // Filter implementation.
   MOCK_METHOD1(Stop, void(FilterCallback* callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // DataSource implementation.
   MOCK_METHOD1(IsUrlSupported, bool(const std::string& url));
   MOCK_METHOD2(Initialize, void(const std::string& url,
                                 FilterCallback* callback));
   MOCK_METHOD0(media_format, const MediaFormat&());
   MOCK_METHOD4(Read, void(int64 position, size_t size, uint8* data,
                           DataSource::ReadCallback* callback));
   MOCK_METHOD1(GetSize, bool(int64* size_out));
   MOCK_METHOD0(IsStreaming, bool());
 
  protected:
   virtual ~MockDataSource() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDataSource);
 };
 
 class MockDemuxer : public Demuxer {
  public:
   MockDemuxer() {}
 
-  // MediaFilter implementation.
+  // Filter implementation.
   MOCK_METHOD1(Stop, void(FilterCallback* callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // Demuxer implementation.
   MOCK_METHOD2(Initialize, void(DataSource* data_source,
                                 FilterCallback* callback));
   MOCK_METHOD0(GetNumberOfStreams, size_t());
   MOCK_METHOD1(GetStream, scoped_refptr<DemuxerStream>(int stream_id));
@@ skipping 21 matching lines @@
  private:
   MediaFormat media_format_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream);
 };
 
 class MockVideoDecoder : public VideoDecoder {
  public:
   MockVideoDecoder() {}
 
-  // MediaFilter implementation.
+  // Filter implementation.
   MOCK_METHOD1(Stop, void(FilterCallback* callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // VideoDecoder implementation.
   MOCK_METHOD2(Initialize, void(DemuxerStream* stream,
                                 FilterCallback* callback));
   MOCK_METHOD0(media_format, const MediaFormat&());
   MOCK_METHOD1(ProduceVideoFrame, void(scoped_refptr<VideoFrame>));
   MOCK_METHOD0(ProvidesBuffer, bool());
 
   // Make this method public so that tests can make use of it.
   void VideoFrameReady(scoped_refptr<VideoFrame> frame) {
     VideoDecoder::VideoFrameReady(frame);
   }
 
  protected:
   virtual ~MockVideoDecoder() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoDecoder);
 };
 
 class MockAudioDecoder : public AudioDecoder {
  public:
   MockAudioDecoder() {}
 
-  // MediaFilter implementation.
+  // Filter implementation.
   MOCK_METHOD1(Stop, void(FilterCallback* callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // AudioDecoder implementation.
   MOCK_METHOD2(Initialize, void(DemuxerStream* stream,
                                 FilterCallback* callback));
   MOCK_METHOD0(media_format, const MediaFormat&());
   MOCK_METHOD1(ProduceAudioSamples, void(scoped_refptr<Buffer>));
 
   // change to public to allow unittest for access;
   ConsumeAudioSamplesCallback* consume_audio_samples_callback() {
     return AudioDecoder::consume_audio_samples_callback();
   }
 
  protected:
   virtual ~MockAudioDecoder() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioDecoder);
 };
 
 class MockVideoRenderer : public VideoRenderer {
  public:
   MockVideoRenderer() {}
 
-  // MediaFilter implementation.
+  // Filter implementation.
   MOCK_METHOD1(Stop, void(FilterCallback* callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // VideoRenderer implementation.
   MOCK_METHOD2(Initialize, void(VideoDecoder* decoder,
                                 FilterCallback* callback));
   MOCK_METHOD0(HasEnded, bool());
   MOCK_METHOD1(ConsumeVideoFrame, void(scoped_refptr<VideoFrame> frame));
 
  protected:
   virtual ~MockVideoRenderer() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoRenderer);
 };
 
 class MockAudioRenderer : public AudioRenderer {
  public:
   MockAudioRenderer() {}
 
-  // MediaFilter implementation.
+  // Filter implementation.
   MOCK_METHOD1(Stop, void(FilterCallback* callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // AudioRenderer implementation.
   MOCK_METHOD2(Initialize, void(AudioDecoder* decoder,
                                 FilterCallback* callback));
   MOCK_METHOD0(HasEnded, bool());
   MOCK_METHOD1(SetVolume, void(float volume));
@@ skipping 21 matching lines @@
   virtual ~MockFilterCollection() {}
 
   // Mock accessors.
   MockDataSource* data_source() const { return data_source_; }
   MockDemuxer* demuxer() const { return demuxer_; }
   MockVideoDecoder* video_decoder() const { return video_decoder_; }
   MockAudioDecoder* audio_decoder() const { return audio_decoder_; }
   MockVideoRenderer* video_renderer() const { return video_renderer_; }
   MockAudioRenderer* audio_renderer() const { return audio_renderer_; }
 
-  MediaFilterCollection* filter_collection() const {
+  FilterCollection* filter_collection() const {
     return filter_collection(true);
   }
 
-  MediaFilterCollection* filter_collection(bool include_data_source) const {
-    MediaFilterCollection* collection = new MediaFilterCollection();
+  FilterCollection* filter_collection(bool include_data_source) const {
+    FilterCollection* collection = new FilterCollection();
 
     if (include_data_source) {
       collection->AddDataSource(data_source_);
     }
     collection->AddDemuxer(demuxer_);
     collection->AddVideoDecoder(video_decoder_);
     collection->AddAudioDecoder(audio_decoder_);
     collection->AddVideoRenderer(video_renderer_);
     collection->AddAudioRenderer(audio_renderer_);
     return collection;
@@ skipping 50 matching lines @@
 
 // Helper gmock action that calls DisableAudioRenderer() on behalf of the
 // provided filter.
 ACTION_P(DisableAudioRenderer, filter) {
   filter->host()->DisableAudioRenderer();
 }
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_