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 /media/video/capture/video_capture_device_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 'media/video/capture/video_capture_device_unittest.cc')
| -rw-r--r-- | media/video/capture/video_capture_device_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc index 735a96a..6a765e1 100644 --- a/media/video/capture/video_capture_device_unittest.cc +++ b/media/video/capture/video_capture_device_unittest.cc @@ -69,7 +69,7 @@ class MockClient : public media::VideoCaptureDevice::Client { explicit MockClient(base::Callback<void(const VideoCaptureFormat&)> frame_cb) : main_thread_(base::MessageLoopProxy::current()), frame_cb_(frame_cb) {} - virtual void OnError(const std::string& error_message) OVERRIDE { + virtual void OnError() OVERRIDE { OnErr(); } |