content/browser/media/capture/desktop_capture_device_aura_unittest.cc - Issue 1064703002: VideoCaptureBufferPool: Refactor to allow support of non-ShMem backed buffers

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/capture/desktop_capture_device_aura_unittest.cc

Issue 1064703002: VideoCaptureBufferPool: Refactor to allow support of non-ShMem backed buffers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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

« no previous file with comments | « content/browser/media/capture/content_video_capture_device_core.cc ('k') | content/browser/media/capture/desktop_capture_device_unittest.cc » ('j') | content/browser/renderer_host/media/video_capture_buffer_pool.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/desktop_capture_device_aura_unittest.cc

diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

index 0ae9aec5fe662122994882d002b1b62046bc8ec4..510f08a8a8bdd9897e45a46145c7fa2cb861eeba 100644

--- a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

+++ b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc

@@ -51,9 +51,8 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {

const media::VideoCaptureFormat& frame_format,

int clockwise_rotation,

const base::TimeTicks& timestamp));

- MOCK_METHOD2(ReserveOutputBuffer,

- scoped_refptr<Buffer>(media::VideoFrame::Format format,

- const gfx::Size& dimensions));

+ MOCK_METHOD1(ReserveOutputBuffer,

+ scoped_refptr<Buffer>(const media::VideoCaptureFormat& format));

MOCK_METHOD3(OnIncomingCapturedVideoFrame,

void(const scoped_refptr<Buffer>& buffer,

const scoped_refptr<media::VideoFrame>& frame,