| Index: media/base/mock_filters.h
|
| diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
|
| index 96f07a5b5466b2a282e050fe7c915de7fc9cc37e..96a4ebb36c5c35a0d239795e1ec20b6c905de2f3 100644
|
| --- a/media/base/mock_filters.h
|
| +++ b/media/base/mock_filters.h
|
| @@ -179,7 +179,8 @@ class MockDemuxerStream : public DemuxerStream {
|
|
|
| class MockVideoDecoder : public VideoDecoder {
|
| public:
|
| - MockVideoDecoder();
|
| + explicit MockVideoDecoder(
|
| + const std::string& decoder_name = "MockVideoDecoder");
|
| virtual ~MockVideoDecoder();
|
|
|
| // VideoDecoder implementation.
|
| @@ -197,12 +198,14 @@ class MockVideoDecoder : public VideoDecoder {
|
| MOCK_CONST_METHOD0(CanReadWithoutStalling, bool());
|
|
|
| private:
|
| + std::string decoder_name_;
|
| DISALLOW_COPY_AND_ASSIGN(MockVideoDecoder);
|
| };
|
|
|
| class MockAudioDecoder : public AudioDecoder {
|
| public:
|
| - MockAudioDecoder();
|
| + explicit MockAudioDecoder(
|
| + const std::string& decoder_name = "MockAudioDecoder");
|
| virtual ~MockAudioDecoder();
|
|
|
| // AudioDecoder implementation.
|
| @@ -218,6 +221,7 @@ class MockAudioDecoder : public AudioDecoder {
|
| MOCK_METHOD1(Reset, void(const base::Closure&));
|
|
|
| private:
|
| + std::string decoder_name_;
|
| DISALLOW_COPY_AND_ASSIGN(MockAudioDecoder);
|
| };
|
|
|
|
|