From 8a5db5aa3c68e4093ef5e162de20b4e1aac5df0a Mon Sep 17 00:00:00 2001 From: Tommi Date: Tue, 15 Dec 2015 10:54:15 +0100 Subject: [PATCH] Remove the call to Terminate() on the main thread. Terminate() must be called on the signaling thread so if the WebRtcAudioDevice hasn't already been uninitialized, there isn't much we can do and instead we need to figure out why and fix it (there might not be a problem). BUG=447042 R=henrika@chromium.org Review URL: https://codereview.chromium.org/1523053006 . Cr-Commit-Position: refs/heads/master@{#365218} --- content/renderer/media/webrtc_audio_device_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc index 9057187db8a945..8931f75e40aa51 100644 --- a/content/renderer/media/webrtc_audio_device_impl.cc +++ b/content/renderer/media/webrtc_audio_device_impl.cc @@ -42,7 +42,7 @@ WebRtcAudioDeviceImpl::WebRtcAudioDeviceImpl() WebRtcAudioDeviceImpl::~WebRtcAudioDeviceImpl() { DVLOG(1) << "WebRtcAudioDeviceImpl::~WebRtcAudioDeviceImpl()"; DCHECK(main_thread_checker_.CalledOnValidThread()); - Terminate(); + DCHECK(!initialized_) << "Terminate must have been called."; } int32_t WebRtcAudioDeviceImpl::AddRef() const {