Allow child processes to abort quitting.

content/common/child_thread.cc

 // Copyright (c) 2011 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/common/child_thread.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/command_line.h"
 #include "content/common/child_process.h"
@@ skipping 17 matching lines @@
   Init();
 }
 
 ChildThread::ChildThread(const std::string& channel_name)
     : channel_name_(channel_name) {
   Init();
 }
 
 void ChildThread::Init() {
   check_with_browser_before_shutdown_ = false;
+  is_waiting_to_shutdown_ = false;
   on_channel_error_called_ = false;
   message_loop_ = MessageLoop::current();
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserAgent)) {
     webkit_glue::SetUserAgent(
         CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kUserAgent));
   }
 
   channel_.reset(new IPC::SyncChannel(channel_name_,
       IPC::Channel::MODE_CLIENT, this,
@@ skipping 129 matching lines @@
 
 bool ChildThread::OnControlMessageReceived(const IPC::Message& msg) {
   return false;
 }
 
 void ChildThread::OnAskBeforeShutdown() {
   check_with_browser_before_shutdown_ = true;
 }
 
 void ChildThread::OnShutdown() {
-  MessageLoop::current()->Quit();
+  if (is_waiting_to_shutdown_)
+    MessageLoop::current()->Quit();
 }
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 void ChildThread::OnSetIPCLoggingEnabled(bool enable) {
   if (enable)
     IPC::Logging::GetInstance()->Enable();
   else
     IPC::Logging::GetInstance()->Disable();
 }
 #endif  //  IPC_MESSAGE_LOG_ENABLED
 
 ChildThread* ChildThread::current() {
   return ChildProcess::current()->main_thread();
 }
 
 void ChildThread::OnProcessFinalRelease() {
   if (on_channel_error_called_ || !check_with_browser_before_shutdown_) {
     MessageLoop::current()->Quit();
     return;
   }
 
   // The child process shutdown sequence is a request response based mechanism,
   // where we send out an initial feeler request to the child process host
   // instance in the browser to verify if it's ok to shutdown the child process.
   // The browser then sends back a response if it's ok to shutdown.
+  is_waiting_to_shutdown_ = true;
   Send(new ChildProcessHostMsg_ShutdownRequest);
 }
+
+void ChildThread::AbortProcessShutdown() {
+  is_waiting_to_shutdown_ = false;
+  MessageLoop::current()->CancelQuit();
+}