Chrome OS: Shutdown without blocking when SIGTERM is received.

chrome/browser/chrome_browser_main_x11.cc

Index: chrome/browser/chrome_browser_main_x11.cc
diff --git a/chrome/browser/chrome_browser_main_x11.cc b/chrome/browser/chrome_browser_main_x11.cc
index 63663c940794a69ab2eeaf44cc44a4b16a40a1f0..adc8ae1b8499687410d98d42ccfc69271603af10 100644
--- a/chrome/browser/chrome_browser_main_x11.cc
+++ b/chrome/browser/chrome_browser_main_x11.cc
@@ -5,6 +5,7 @@
 #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"
@@ -55,6 +56,7 @@ int BrowserX11IOErrorHandler(Display* d) {
   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();
   }