| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index 0dff66e49fa3c8e770ff4e8bd97608506e91bb00..99bc9da76c39cd48dd10861a4cdde54e17981f7d 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -614,9 +614,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();
|
|
|
| @@ -638,6 +635,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()) {
|
|
|