Revert of Delete "shutdown without closing browsers" path

chrome/browser/chrome_browser_main_extra_parts_x11.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 "chrome/browser/chrome_browser_main_extra_parts_x11.h"
 
 #include "base/bind.h"
 #include "base/debug/debugger.h"
 #include "base/message_loop/message_loop.h"
+#include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/base/x/x11_util_internal.h"
 
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 27 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 received (X server probably went away)";
+    browser_shutdown::SetShuttingDownWithoutClosingBrowsers(true);
     chrome::SessionEnding();
   }
 
   return 0;
 }
 
 int X11EmptyErrorHandler(Display* d, XErrorEvent* error) {
   return 0;
 }
 
@@ skipping 22 matching lines @@
   // if X exits before us.
   ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
 }
 
 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() {
   // Unset the X11 error handlers. The X11 error handlers log the errors using a
   // |PostTask()| on the message-loop. But since the message-loop is in the
   // process of terminating, this can cause errors.
   ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler);
 }