Index: webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h |
diff --git a/webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h b/webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h |
index 3f67a9ef85d19138fa1ac827bdc14a4472825efc..720075da5485a1f3a7a42affa15d62fa072f466a 100644 |
--- a/webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h |
+++ b/webrtc/modules/desktop_capture/mock_desktop_capturer_callback.h |
@@ -10,11 +10,29 @@ |
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ |
#define WEBRTC_MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ |
-#include "webrtc/modules/desktop_capture/screen_capturer_mock_objects.h" |
+#include "webrtc/modules/desktop_capture/desktop_capturer.h" |
+ |
+#include <memory> |
+ |
+#include "webrtc/test/gmock.h" |
namespace webrtc { |
-// TODO(zijiehe): Remove MockScreenCapturerCallback. |
-class MockDesktopCapturerCallback : public MockScreenCapturerCallback {}; |
+ |
+class MockDesktopCapturerCallback : public DesktopCapturer::Callback { |
+ public: |
+ MockDesktopCapturerCallback(); |
+ ~MockDesktopCapturerCallback() override; |
+ |
+ MOCK_METHOD2(OnCaptureResultPtr, |
+ void(DesktopCapturer::Result result, |
+ std::unique_ptr<DesktopFrame>* frame)); |
+ void OnCaptureResult(DesktopCapturer::Result result, |
+ std::unique_ptr<DesktopFrame> frame) final; |
+ |
+ private: |
+ RTC_DISALLOW_COPY_AND_ASSIGN(MockDesktopCapturerCallback); |
+}; |
+ |
} // namespace webrtc |
#endif // WEBRTC_MODULES_DESKTOP_CAPTURE_MOCK_DESKTOP_CAPTURER_CALLBACK_H_ |