Chromium Code Reviews| Index: content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc |
| diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc |
| index 8a4f46e20cd9272be2eb04ff9e105aba727356f3..afdafeb70af2f1c0cd9a369e8d33d9a62c44f2bc 100644 |
| --- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc |
| +++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc |
| @@ -19,7 +19,7 @@ static void ReleaseMailboxCB(const gpu::SyncToken& sync_token) {} |
| namespace content { |
| class WebRtcVideoCapturerAdapterTest |
| - : public rtc::VideoSinkInterface<cricket::VideoFrame>, |
| + : public rtc::VideoSinkInterface<webrtc::VideoFrame>, |
| public ::testing::Test { |
| public: |
| WebRtcVideoCapturerAdapterTest() |
| @@ -77,7 +77,7 @@ class WebRtcVideoCapturerAdapterTest |
| } |
| // rtc::VideoSinkInterface |
| - void OnFrame(const cricket::VideoFrame& frame) override { |
| + void OnFrame(const webrtc::VideoFrame& frame) override { |
| output_frame_ = frame; |
| output_frame_width_ = frame.width(); |
| output_frame_height_ = frame.height(); |
| @@ -88,7 +88,8 @@ class WebRtcVideoCapturerAdapterTest |
| const ChildProcess child_process_; |
| WebRtcVideoCapturerAdapter adapter_; |
| - cricket::VideoFrame output_frame_; |
| + // TODO(nisse): Default constructor is deprecated. Use std::optional? |
|
Sergey Ulanov
2016/11/02 19:33:59
std::optional is C++17. But this code could use ba
nisse-chromium (ooo August 14)
2016/11/07 09:58:19
I figured there's something similar to std::Option
|
| + webrtc::VideoFrame output_frame_; |
| int output_frame_width_; |
| int output_frame_height_; |
| }; |