Avoid race at shutdown between browser process' IO thread and GPU thread

content/child/child_thread_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/child_thread_impl.h"
 
 #include <signal.h>
 #include <string>
 #include <utility>
 
@@ skipping 601 matching lines @@
 bool ChildThreadImpl::ShouldBeDestroyed() {
   return true;
 }
 
 void ChildThreadImpl::OnChannelConnected(int32_t peer_pid) {
   channel_connected_factory_.reset();
 }
 
 void ChildThreadImpl::OnChannelError() {
   on_channel_error_called_ = true;
-  base::MessageLoop::current()->QuitWhenIdle();
+  // If this thread runs in the browser process, only Thread::Stop should
+  // stop its message loop. Otherwise, QuitWhenIdle could race Thread::Stop.
+  if (!IsInBrowserProcess())
+    base::MessageLoop::current()->QuitWhenIdle();
 }
 
 bool ChildThreadImpl::Send(IPC::Message* msg) {
   DCHECK(message_loop_->task_runner()->BelongsToCurrentThread());
   if (!channel_) {
     delete msg;
     return false;
   }
 
   return channel_->Send(msg);
@@ skipping 223 matching lines @@
   Listener* route = router_.GetRoute(routing_id);
   if (route)
     route->OnAssociatedInterfaceRequest(name, request.PassHandle());
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return static_cast<bool>(browser_process_io_runner_);
 }
 
 }  // namespace content