content/browser/renderer_host/media/desktop_capture_device_unittest.cc - Issue 23551011: From Video Capture, abolish OnFrameInfo and enable resolution changes

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/renderer_host/media/desktop_capture_device_unittest.cc

Issue 23551011: From Video Capture, abolish OnFrameInfo and enable resolution changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add assert to vcbp unittest Created 7 years, 2 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 | « no previous file | content/browser/renderer_host/media/video_capture_buffer_pool.h » ('j') | content/browser/renderer_host/media/video_capture_buffer_pool.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/desktop_capture_device_unittest.cc

diff --git a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc

index 363c3f8dc002cd77e9a260a4dca31fab49a7a1fb..5b34e1e641ac8258b42b59f5dc0c7ab765bde639 100644

--- a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc

+++ b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc

@@ -40,7 +40,8 @@ const int kFrameRate = 30;

class MockDeviceClient : public media::VideoCaptureDevice::Client {

public:

- MOCK_METHOD0(ReserveOutputBuffer, scoped_refptr<media::VideoFrame>());

+ MOCK_METHOD1(ReserveOutputBuffer,

+ scoped_refptr<media::VideoFrame>(const gfx::Size& size));

MOCK_METHOD0(OnError, void());

MOCK_METHOD1(OnFrameInfo, void(const media::VideoCaptureCapability& info));

MOCK_METHOD1(OnFrameInfoChanged,