| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index d6aa2743bc5c0e553da66e7b70ee3934740beb6f..20470088947c6054fbbadc96f30056c0e1094375 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -616,9 +616,6 @@ void RenderThreadImpl::Shutdown() {
|
| RemoveFilter(audio_input_message_filter_.get());
|
| audio_input_message_filter_ = NULL;
|
|
|
| - RemoveFilter(audio_message_filter_.get());
|
| - audio_message_filter_ = NULL;
|
| -
|
| #if defined(ENABLE_WEBRTC)
|
| RTCPeerConnectionHandler::DestructAllHandlers();
|
|
|
| @@ -640,6 +637,11 @@ void RenderThreadImpl::Shutdown() {
|
| }
|
|
|
| media_thread_.reset();
|
| +
|
| + // AudioMessageFilter may be accessed on |media_thread_|, so shutdown after.
|
| + RemoveFilter(audio_message_filter_.get());
|
| + audio_message_filter_ = NULL;
|
| +
|
| compositor_thread_.reset();
|
| input_handler_manager_.reset();
|
| if (input_event_filter_.get()) {
|
|
|