| Index: webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
|
| diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
|
| index 6652a1af71e1125e02bfca000539cbdf2a45e971..6b29eae23918ddb8210695051713370d4eaf48cc 100644
|
| --- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
|
| +++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer_unittest.cc
|
| @@ -78,15 +78,15 @@ class FakeScreenCapturer : public DesktopCapturer {
|
| void Start(Callback* callback) override { callback_ = callback; }
|
|
|
| void Capture(const DesktopRegion& region) override {
|
| - callback_->OnCaptureCompleted(next_frame_.release());
|
| + callback_->OnCaptureCompleted(std::move(next_frame_));
|
| }
|
|
|
| - void SetNextFrame(DesktopFrame* next_frame) {
|
| - next_frame_.reset(next_frame);
|
| + void SetNextFrame(std::unique_ptr<DesktopFrame> next_frame) {
|
| + next_frame_ = std::move(next_frame);
|
| }
|
|
|
| private:
|
| - Callback* callback_;
|
| + Callback* callback_ = nullptr;
|
|
|
| std::unique_ptr<DesktopFrame> next_frame_;
|
| };
|
| @@ -165,11 +165,12 @@ class DesktopAndCursorComposerTest : public testing::Test,
|
| DesktopAndCursorComposerTest()
|
| : fake_screen_(new FakeScreenCapturer()),
|
| fake_cursor_(new FakeMouseMonitor()),
|
| - blender_(fake_screen_, fake_cursor_) {
|
| - }
|
| + blender_(fake_screen_, fake_cursor_) {}
|
|
|
| // DesktopCapturer::Callback interface
|
| - void OnCaptureCompleted(DesktopFrame* frame) override { frame_.reset(frame); }
|
| + void OnCaptureCompleted(std::unique_ptr<DesktopFrame> frame) override {
|
| + frame_ = std::move(frame);
|
| + }
|
|
|
| protected:
|
| // Owned by |blender_|.
|
| @@ -187,7 +188,7 @@ TEST_F(DesktopAndCursorComposerTest, Error) {
|
|
|
| fake_cursor_->SetHotspot(DesktopVector());
|
| fake_cursor_->SetState(MouseCursorMonitor::INSIDE, DesktopVector());
|
| - fake_screen_->SetNextFrame(NULL);
|
| + fake_screen_->SetNextFrame(nullptr);
|
|
|
| blender_.Capture(DesktopRegion());
|
|
|
|
|