Revert of Delete "shutdown without closing browsers" path

chrome/browser/lifetime/application_lifetime.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/lifetime/application_lifetime.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 95 matching lines @@
 
 void CloseAllBrowsersAndQuit() {
   browser_shutdown::SetTryingToQuit(true);
   CloseAllBrowsers();
 }
 
 void CloseAllBrowsers() {
   // If there are no browsers and closing the last browser would quit the
   // application, send the APP_TERMINATING action here. Otherwise, it will be
   // sent by RemoveBrowser() when the last browser has closed.
-  if (chrome::GetTotalBrowserCount() == 0 &&
-      (browser_shutdown::IsTryingToQuit() || !chrome::WillKeepAlive())) {
+  if (browser_shutdown::ShuttingDownWithoutClosingBrowsers() ||
+      (chrome::GetTotalBrowserCount() == 0 &&
+       (browser_shutdown::IsTryingToQuit() || !chrome::WillKeepAlive()))) {
     // Tell everyone that we are shutting down.
     browser_shutdown::SetTryingToQuit(true);
 
 #if defined(ENABLE_SESSION_SERVICE)
     // If ShuttingDownWithoutClosingBrowsers() returns true, the session
     // services may not get a chance to shut down normally, so explicitly shut
     // them down here to ensure they have a chance to persist their data.
     ProfileManager::ShutdownSessionServices();
 #endif
 
@@ skipping 268 matching lines @@
   //    environment is still active.
   if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE)
     return !ash::Shell::HasInstance();
   else if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
     return BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->empty();
 #endif
   return true;
 }
 
 }  // namespace chrome