Index: content/renderer/media/mock_media_stream_video_sink.h |
diff --git a/content/renderer/media/mock_media_stream_video_sink.h b/content/renderer/media/mock_media_stream_video_sink.h |
index 07ec43fa73d8b5215489b8cf6e30608126c551da..acab87156363402f4e0c09cca6d5bddd8e586ff4 100644 |
--- a/content/renderer/media/mock_media_stream_video_sink.h |
+++ b/content/renderer/media/mock_media_stream_video_sink.h |
@@ -7,6 +7,8 @@ |
#include "content/public/renderer/media_stream_video_sink.h" |
+#include "base/memory/weak_ptr.h" |
+#include "content/common/media/video_capture.h" |
#include "media/base/video_frame.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -17,15 +19,15 @@ class MockMediaStreamVideoSink : public MediaStreamVideoSink { |
MockMediaStreamVideoSink(); |
virtual ~MockMediaStreamVideoSink(); |
- virtual void OnVideoFrame( |
- const scoped_refptr<media::VideoFrame>& frame) OVERRIDE; |
virtual void OnReadyStateChanged( |
- blink::WebMediaStreamSource::ReadyState state) OVERRIDE; |
+ blink::WebMediaStreamSource::ReadyState state) OVERRIDE; |
virtual void OnEnabledChanged(bool enabled) OVERRIDE; |
// Triggered when OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame) |
// is called. |
- MOCK_METHOD0(OnVideoFrame, void()); |
+ MOCK_METHOD0(OnVideoFrame, void()); |
+ |
+ VideoCaptureDeliverFrameCB GetDeliverFrameCB(); |
int number_of_frames() const { return number_of_frames_; } |
media::VideoFrame::Format format() const { return format_; } |
@@ -35,11 +37,16 @@ class MockMediaStreamVideoSink : public MediaStreamVideoSink { |
blink::WebMediaStreamSource::ReadyState state() const { return state_; } |
private: |
+ void DeliverVideoFrame( |
+ const scoped_refptr<media::VideoFrame>& frame, |
+ const media::VideoCaptureFormat& format); |
+ |
int number_of_frames_; |
bool enabled_; |
media::VideoFrame::Format format_; |
blink::WebMediaStreamSource::ReadyState state_; |
gfx::Size frame_size_; |
+ base::WeakPtrFactory<MockMediaStreamVideoSink> weak_factory_; |
}; |
} // namespace content |