content/browser/renderer_host/media/desktop_capture_device_unittest.cc - Issue 140633004: Reland CL to implement browser-side logging to WebRtc log.

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 140633004: Reland CL to implement browser-side logging to WebRtc log. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: These are the changes that should fix crbug.com/338848 Created 6 years, 11 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/renderer_host/media/desktop_capture_device_aura_unittest.cc ('k') | content/browser/renderer_host/media/media_stream_manager.h » ('j') | content/browser/renderer_host/media/media_stream_manager.cc » ('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 90ac57b1f2500bcfe175b995d4387978e68ce8f5..c51172a08d04b4a77d7bed9147e12d100e29c650 100644

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

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

@@ -43,7 +43,7 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {

MOCK_METHOD2(ReserveOutputBuffer,

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

const gfx::Size& dimensions));

- MOCK_METHOD0(OnError, void());

+ MOCK_METHOD1(OnError, void(const std::string& reason));

MOCK_METHOD5(OnIncomingCapturedFrame,

void(const uint8* data,

int length,

@@ -164,7 +164,7 @@ TEST_F(DesktopCaptureDeviceTest, MAYBE_Capture) {

int frame_size;

scoped_ptr<MockDeviceClient> client(new MockDeviceClient());

- EXPECT_CALL(*client, OnError()).Times(0);

+ EXPECT_CALL(*client, OnError(_)).Times(0);

EXPECT_CALL(*client, OnIncomingCapturedFrame(_, _, _, _, _))

.WillRepeatedly(

DoAll(SaveArg<1>(&frame_size),

@@ -204,7 +204,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeConstantResolution) {

int frame_size;

scoped_ptr<MockDeviceClient> client(new MockDeviceClient());

- EXPECT_CALL(*client, OnError()).Times(0);

+ EXPECT_CALL(*client, OnError(_)).Times(0);

EXPECT_CALL(*client, OnIncomingCapturedFrame(_, _, _, _, _))

.WillRepeatedly(

DoAll(SaveArg<1>(&frame_size),

@@ -251,7 +251,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeVariableResolution) {

base::WaitableEvent done_event(false, false);

scoped_ptr<MockDeviceClient> client(new MockDeviceClient());

- EXPECT_CALL(*client, OnError()).Times(0);

+ EXPECT_CALL(*client, OnError(_)).Times(0);

EXPECT_CALL(*client, OnIncomingCapturedFrame(_, _, _, _, _))

.WillRepeatedly(

DoAll(SaveArg<4>(&format),