| Index: content/renderer/media/mock_media_stream_video_source.h
|
| diff --git a/content/renderer/media/mock_media_stream_video_source.h b/content/renderer/media/mock_media_stream_video_source.h
|
| index 7c4746e23ab3a285cac4bba78596219560342649..5c8603b3bf3115be5cc683534cc7b0ef0c76c9f6 100644
|
| --- a/content/renderer/media/mock_media_stream_video_source.h
|
| +++ b/content/renderer/media/mock_media_stream_video_source.h
|
| @@ -14,9 +14,8 @@ namespace content {
|
|
|
| class MockMediaStreamVideoSource : public MediaStreamVideoSource {
|
| public:
|
| - explicit MockMediaStreamVideoSource(bool manual_get_supported_formats);
|
| - MockMediaStreamVideoSource(bool manual_get_supported_formats,
|
| - bool respond_to_request_refresh_frame);
|
| + MockMediaStreamVideoSource();
|
| + explicit MockMediaStreamVideoSource(bool respond_to_request_refresh_frame);
|
| MockMediaStreamVideoSource(const media::VideoCaptureFormat& format,
|
| bool respond_to_request_refresh_frame);
|
| virtual ~MockMediaStreamVideoSource();
|
| @@ -33,10 +32,6 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource {
|
| // or FailToStartMockedSource has not been called.
|
| bool SourceHasAttemptedToStart() { return attempted_to_start_; }
|
|
|
| - void SetSupportedFormats(const media::VideoCaptureFormats& formats) {
|
| - supported_formats_ = formats;
|
| - }
|
| -
|
| // Delivers |frame| to all registered tracks on the IO thread. Its up to the
|
| // call to make sure MockMediaStreamVideoSource is not destroyed before the
|
| // frame has been delivered.
|
| @@ -59,11 +54,6 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource {
|
|
|
| protected:
|
| // Implements MediaStreamVideoSource.
|
| - void GetCurrentSupportedFormats(
|
| - int max_requested_height,
|
| - int max_requested_width,
|
| - double max_requested_frame_rate,
|
| - const VideoCaptureDeviceFormatsCB& callback) override;
|
| void StartSourceImpl(
|
| const media::VideoCaptureFormat& format,
|
| const blink::WebMediaConstraints& constraints,
|
| @@ -74,14 +64,11 @@ class MockMediaStreamVideoSource : public MediaStreamVideoSource {
|
|
|
| private:
|
| media::VideoCaptureFormat format_;
|
| - media::VideoCaptureFormats supported_formats_;
|
| - bool manual_get_supported_formats_;
|
| bool respond_to_request_refresh_frame_;
|
| int max_requested_height_;
|
| int max_requested_width_;
|
| double max_requested_frame_rate_;
|
| bool attempted_to_start_;
|
| - VideoCaptureDeviceFormatsCB formats_callback_;
|
| VideoCaptureDeliverFrameCB frame_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MockMediaStreamVideoSource);
|
|
|