diff options
| author | vrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 00:55:43 +0000 |
|---|---|---|
| committer | vrk@chromium.org <vrk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 00:55:43 +0000 |
| commit | d95595eb5145e310baf692f359f9488faf73750d (patch) | |
| tree | 41e2e610d8c3856acf1f747891509dcd12abbd65 /content/browser/renderer_host/media/video_capture_controller_unittest.cc | |
| parent | b3c1b3b66d1c720172e731d1bfc44cfb44c992a3 (diff) | |
| download | chromium_src-d95595eb5145e310baf692f359f9488faf73750d.zip chromium_src-d95595eb5145e310baf692f359f9488faf73750d.tar.gz chromium_src-d95595eb5145e310baf692f359f9488faf73750d.tar.bz2 | |
Revert 247164 "Implement browser-side logging to WebRtc log"
Need to revert this because it's causing crashes on Canary.
BUG=338848
> Implement browser-side logging to WebRtc log
>
> This adds a logging callback to RenderProcessHost and also adds logging
> for device enumeration in the browser process.
>
> BUG=332261
>
> Review URL: https://codereview.chromium.org/140843007
TBR=vrk@chromium.org
Review URL: https://codereview.chromium.org/132233058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/media/video_capture_controller_unittest.cc')
| -rw-r--r-- | content/browser/renderer_host/media/video_capture_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 b4de263..1852a71 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("Test Error"); + device_->OnError(); 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("Test error"); + device_->OnError(); device_->OnIncomingCapturedBuffer(buffer, media::VideoFrame::I420, dims, |