Remove RenderThreadImpl::Shutdown

content/child/child_process.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_process.h"
 
 #include <string.h>
 
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 49 matching lines @@
 
 ChildProcess::~ChildProcess() {
   DCHECK(g_lazy_tls.Pointer()->Get() == this);
 
   // Signal this event before destroying the child process.  That way all
   // background threads can cleanup.
   // For example, in the renderer the RenderThread instances will be able to
   // notice shutdown before the render process begins waiting for them to exit.
   shutdown_event_.Signal();
 
-  // Kill the main thread object before nulling child_process, since
-  // destruction code might depend on it.
   if (main_thread_) {  // null in unittests.
     main_thread_->Shutdown();
-    main_thread_.reset();
+    if (main_thread_->ShouldBeDestroyed()) {
+      main_thread_.reset();
+    } else {
+      // Leak the main_thread_. See a comment in
+      // RenderThreadImpl::ShouldBeDestroyed.
+      main_thread_.release();
+    }
   }
 
   g_lazy_tls.Pointer()->Set(NULL);
   io_thread_.Stop();
 }
 
 ChildThreadImpl* ChildProcess::main_thread() {
   return main_thread_.get();
 }
 
@@ skipping 67 matching lines @@
   memset(&sa, 0, sizeof(sa));
   sa.sa_handler = SigUSR1Handler;
   sigaction(SIGUSR1, &sa, NULL);
 
   pause();
 #endif  // defined(OS_ANDROID)
 #endif  // defined(OS_POSIX)
 }
 
 }  // namespace content