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

Unified Diff: chrome/browser/media/native_desktop_media_list_unittest.cc

Issue 2050353002: Update webrtc::DesktopCapturer clients to implement OnCaptureResult(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix chromeos Created 4 years, 6 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: chrome/browser/media/native_desktop_media_list_unittest.cc
diff --git a/chrome/browser/media/native_desktop_media_list_unittest.cc b/chrome/browser/media/native_desktop_media_list_unittest.cc
index 8cde654ef8714a6decae4ca604de2e1f9a42b149..04ef29e1807961fa796cdda0dbb88e49fd74f80b 100644
--- a/chrome/browser/media/native_desktop_media_list_unittest.cc
+++ b/chrome/browser/media/native_desktop_media_list_unittest.cc
@@ -67,10 +67,11 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer {
void Capture(const webrtc::DesktopRegion& region) override {
DCHECK(callback_);
- webrtc::DesktopFrame* frame =
- new webrtc::BasicDesktopFrame(webrtc::DesktopSize(10, 10));
+ std::unique_ptr<webrtc::DesktopFrame> frame(
+ new webrtc::BasicDesktopFrame(webrtc::DesktopSize(10, 10)));
memset(frame->data(), 0, frame->stride() * frame->size().height());
- callback_->OnCaptureCompleted(frame);
+ callback_->OnCaptureResult(webrtc::DesktopCapturer::Result::SUCCESS,
+ std::move(frame));
}
bool GetScreenList(ScreenList* screens) override {
@@ -121,10 +122,11 @@ class FakeWindowCapturer : public webrtc::WindowCapturer {
std::map<WindowId, int8_t>::iterator it =
frame_values_.find(selected_window_id_);
int8_t value = (it != frame_values_.end()) ? it->second : 0;
- webrtc::DesktopFrame* frame =
- new webrtc::BasicDesktopFrame(webrtc::DesktopSize(10, 10));
+ std::unique_ptr<webrtc::DesktopFrame> frame(
+ new webrtc::BasicDesktopFrame(webrtc::DesktopSize(10, 10)));
memset(frame->data(), value, frame->stride() * frame->size().height());
- callback_->OnCaptureCompleted(frame);
+ callback_->OnCaptureResult(webrtc::DesktopCapturer::Result::SUCCESS,
+ std::move(frame));
}
bool GetWindowList(WindowList* windows) override {
« no previous file with comments | « chrome/browser/media/native_desktop_media_list.cc ('k') | content/browser/media/capture/desktop_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698