Chrome OS: Shutdown without blocking when SIGTERM is received.

chrome/browser/chrome_browser_main_x11.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 "chrome/browser/chrome_browser_main.h"
 
 #include "base/debug/debugger.h"
+#include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "content/browser/browser_thread.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/base/x/x11_util_internal.h"
 
 #if defined(USE_LINUX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"
 #endif
@@ skipping 30 matching lines @@
     // to get the error. We can't call shutdown from this thread without
     // tripping an error. Doing it through a function so that we'll be able
     // to see it in any crash dumps.
     WaitingForUIThreadToHandleIOError();
     return 0;
   }
   // If there's an IO error it likely means the X server has gone away
   if (!g_in_x11_io_error_handler) {
     g_in_x11_io_error_handler = true;
     LOG(ERROR) << "X IO Error detected";
+    browser_shutdown::SetShuttingDownWithoutClosingBrowsers(true);
     BrowserList::SessionEnding();
   }
 
   return 0;
 }
 
 }  // namespace
 
 void RecordBreakpadStatusUMA(MetricsService* metrics) {
 #if defined(USE_LINUX_BREAKPAD)
@@ skipping 27 matching lines @@
 }
 
 void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) {
 }
 
 void SetBrowserX11ErrorHandlers() {
   // Set up error handlers to make sure profile gets written if X server
   // goes away.
   ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
 }