content/browser/renderer_host/media/video_capture_controller_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/video_capture_controller_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

« content/browser/renderer_host/media/media_stream_manager.cc ('K') | « content/browser/renderer_host/media/video_capture_controller.cc ('k') | content/browser/renderer_host/media/video_capture_device_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1852a71fe8a3d61f828453a9cebe97fbff30c621..b4de263956213ad39943f123da8b93d2288d81d2 100644

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

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

@@ -407,7 +407,7 @@ TEST_F(VideoCaptureControllerTest, ErrorBeforeDeviceCreation) {

// Start with one client.

controller_->AddClient(

route_id, client_a_.get(), base::kNullProcessHandle, 100, session_100);

- device_->OnError();

+ device_->OnError("Test Error");

EXPECT_CALL(*client_a_, DoError(route_id)).Times(1);

base::RunLoop().RunUntilIdle();

Mock::VerifyAndClearExpectations(client_a_.get());

@@ -462,7 +462,7 @@ TEST_F(VideoCaptureControllerTest, ErrorAfterDeviceCreation) {

device_->ReserveOutputBuffer(media::VideoFrame::I420, dims);

ASSERT_TRUE(buffer);

- device_->OnError();

+ device_->OnError("Test error");

device_->OnIncomingCapturedBuffer(buffer,

media::VideoFrame::I420,

dims,