| Index: media/base/mock_filters.h
|
| ===================================================================
|
| --- media/base/mock_filters.h (revision 23335)
|
| +++ media/base/mock_filters.h (working copy)
|
| @@ -242,6 +242,7 @@
|
| // VideoRenderer implementation.
|
| MOCK_METHOD2(Initialize, void(VideoDecoder* decoder,
|
| FilterCallback* callback));
|
| + MOCK_METHOD0(HasEnded, bool());
|
|
|
| protected:
|
| virtual ~MockVideoRenderer() {}
|
| @@ -263,6 +264,7 @@
|
| // AudioRenderer implementation.
|
| MOCK_METHOD2(Initialize, void(AudioDecoder* decoder,
|
| FilterCallback* callback));
|
| + MOCK_METHOD0(HasEnded, bool());
|
| MOCK_METHOD1(SetVolume, void(float volume));
|
|
|
| protected:
|
|
|
| Property changes on: media\base\mock_filters.h
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/media/base/mock_filters.h:r23255
|
|
|
|
|