Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Unified Diff: webrtc/modules/desktop_capture/screen_capturer_mock_objects.h

Issue 1988783003: Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
diff --git a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
index 7264249e0fb0c70403ece92b121b5b54e7678c13..800da95f101c4bdf66d079156cac0e46ac1eef80 100644
--- a/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
+++ b/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
@@ -36,7 +36,11 @@ class MockScreenCapturerCallback : public ScreenCapturer::Callback {
MockScreenCapturerCallback() {}
virtual ~MockScreenCapturerCallback() {}
- MOCK_METHOD1(OnCaptureCompleted, void(DesktopFrame*));
+ MOCK_METHOD1(OnCaptureCompletedPtr,
+ void(std::unique_ptr<DesktopFrame>* frame));
Wez 2016/05/18 01:29:50 In our other tests we un-wrap the |frame| so that
Sergey Ulanov 2016/05/31 12:02:48 When passing unique_ptr<>* the test doesn't have t
Wez 2016/06/01 21:29:04 Ah, very nice. Sounds like we should follow this p
+ void OnCaptureCompleted(std::unique_ptr<DesktopFrame> frame) override {
+ OnCaptureCompletedPtr(&frame);
+ }
private:
RTC_DISALLOW_COPY_AND_ASSIGN(MockScreenCapturerCallback);

Powered by Google App Engine
This is Rietveld 408576698