Refactor shutdown code to allow win/linux to run after last browser closes.

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2010 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/browser_process_impl.h"
 
 #include <map>
 
 #include "app/clipboard/clipboard.h"
 #include "app/l10n_util.h"
@@ skipping 529 matching lines @@
 
   have_inspector_files_ = result;
 }
 
 // Mac is currently not supported.
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
 
 bool BrowserProcessImpl::CanAutorestartForUpdate() const {
   // Check if browser is in the background and if it needs to be restarted to
   // apply a pending update.
-  return BrowserList::IsInPersistentMode() && Upgrade::IsUpdatePendingRestart();
+  return BrowserList::size() == 0 && !BrowserList::WillKeepAlive() &&
+         Upgrade::IsUpdatePendingRestart();
 }
 
 // Switches enumerated here will be removed when a background instance of
 // Chrome restarts itself. If your key is designed to only be used once,
 // or if it does not make sense when restarting a background instance to
 // pick up an automatic update, be sure to add it to this list.
 const char* const kSwitchesToRemoveOnAutorestart[] = {
     switches::kApp,
     switches::kFirstRun,
     switches::kImport,
@@ skipping 36 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)