Replace hard-coded media_format() methods with Google Mock methods declared in mock_filters.h.

media/base/mock_filters.h

 // Copyright (c) 2009 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.
@@ skipping 83 matching lines @@
 
   // MediaFilter implementation.
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD1(OnReceivedMessage, void(FilterMessage message));
 
   // DataSource implementation.
   MOCK_METHOD2(Initialize, void(const std::string& url,
                                 FilterCallback* callback));
-  const MediaFormat& media_format() { return media_format_; }
+  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:
-  MediaFormat media_format_;
-
   DISALLOW_COPY_AND_ASSIGN(MockDataSource);
 };
 
 class MockDemuxer : public Demuxer {
  public:
   MockDemuxer() {}
 
   // MediaFilter implementation.
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
@@ skipping 10 matching lines @@
   virtual ~MockDemuxer() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDemuxer);
 };
 
 class MockDemuxerStream : public DemuxerStream {
  public:
   MockDemuxerStream() {}
 
-  // Sets the mime type of this object's media format, which is usually checked
-  // to determine the type of decoder to create.
-  explicit MockDemuxerStream(const std::string& mime_type) {
-    media_format_.SetAsString(MediaFormat::kMimeType, mime_type);
-  }
-
   // DemuxerStream implementation.
-  const MediaFormat& media_format() { return media_format_; }
+  MOCK_METHOD0(media_format, const MediaFormat&());
   MOCK_METHOD1(Read, void(Callback1<Buffer*>::Type* read_callback));
   MOCK_METHOD1(QueryInterface, void*(const char* interface_id));
 
  protected:
   virtual ~MockDemuxerStream() {}
 
  private:
   MediaFormat media_format_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream);
 };
 
 class MockVideoDecoder : public VideoDecoder {
  public:
   MockVideoDecoder() {}
 
-  // Sets the essential media format keys for this decoder.
-  MockVideoDecoder(const std::string& mime_type, int width, int height) {
-    media_format_.SetAsString(MediaFormat::kMimeType, mime_type);
-    media_format_.SetAsInteger(MediaFormat::kWidth, width);
-    media_format_.SetAsInteger(MediaFormat::kHeight, height);
-  }
-
   // MediaFilter implementation.
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD1(OnReceivedMessage, void(FilterMessage message));
 
   // VideoDecoder implementation.
   MOCK_METHOD2(Initialize, void(DemuxerStream* stream,
                                 FilterCallback* callback));
-  const MediaFormat& media_format() { return media_format_; }
+  MOCK_METHOD0(media_format, const MediaFormat&());
   MOCK_METHOD1(Read, void(Callback1<VideoFrame*>::Type* read_callback));
 
  protected:
   virtual ~MockVideoDecoder() {}
 
  private:
-  MediaFormat media_format_;
-
   DISALLOW_COPY_AND_ASSIGN(MockVideoDecoder);
 };
 
 class MockAudioDecoder : public AudioDecoder {
  public:
   MockAudioDecoder() {}
 
-  // Sets the essential media format keys for this decoder.
-  MockAudioDecoder(int channels, int sample_rate, int sample_bits) {
-    media_format_.SetAsString(MediaFormat::kMimeType,
-                              mime_type::kUncompressedAudio);
-    media_format_.SetAsInteger(MediaFormat::kChannels, channels);
-    media_format_.SetAsInteger(MediaFormat::kSampleRate, sample_rate);
-    media_format_.SetAsInteger(MediaFormat::kSampleBits, sample_bits);
-  }
-
   // MediaFilter implementation.
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, FilterCallback* callback));
   MOCK_METHOD1(OnReceivedMessage, void(FilterMessage message));
 
   // AudioDecoder implementation.
   MOCK_METHOD2(Initialize, void(DemuxerStream* stream,
                                 FilterCallback* callback));
-  const MediaFormat& media_format() { return media_format_; }
+  MOCK_METHOD0(media_format, const MediaFormat&());
   MOCK_METHOD1(Read, void(Callback1<Buffer*>::Type* read_callback));
 
  protected:
   virtual ~MockAudioDecoder() {}
 
  private:
-  MediaFormat media_format_;
-
   DISALLOW_COPY_AND_ASSIGN(MockAudioDecoder);
 };
 
 class MockVideoRenderer : public VideoRenderer {
  public:
   MockVideoRenderer() {}
 
   // MediaFilter implementation.
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
@@ skipping 136 matching lines @@
 
 // Helper gmock action that calls BroadcastMessage() on behalf of the provided
 // filter.
 ACTION_P2(BroadcastMessage, filter, message) {
   filter->host()->BroadcastMessage(message);
 }
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_