Merge 114213 - Fixes for the kWasRestarted pref.

chrome/browser/ui/browser_list.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/ui/browser_list.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 284 matching lines @@
       << "observer list modified during notification";
 }
 
 // static
 void BrowserList::MarkAsCleanShutdown() {
   for (const_iterator i = begin(); i != end(); ++i) {
     (*i)->profile()->MarkAsCleanShutdown();
   }
 }
 
-void BrowserList::AttemptExitInternal(bool restart) {
-  PrefService* pref_service = g_browser_process->local_state();
-  pref_service->SetBoolean(prefs::kWasRestarted, restart);
+void BrowserList::AttemptExitInternal() {
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_APP_EXITING,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 
 #if !defined(OS_MACOSX)
   // On most platforms, closing all windows causes the application to exit.
   CloseAllBrowsers();
 #else
   // On the Mac, the application continues to run once all windows are closed.
@@ skipping 156 matching lines @@
     }
   }
 
   for (BrowserVector::const_iterator i = browsers_to_close.begin();
        i != browsers_to_close.end(); ++i) {
     (*i)->window()->Close();
   }
 }
 
 // static
-void BrowserList::AttemptUserExit(bool restart) {
+void BrowserList::AttemptUserExit() {
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutStarted", false);
   // Write /tmp/uptime-logout-started as well.
   const char kLogoutStarted[] = "logout-started";
   chromeos::BootTimesLoader::Get()->RecordCurrentStats(kLogoutStarted);
 
   // Login screen should show up in owner's locale.
   PrefService* state = g_browser_process->local_state();
   if (state) {
     std::string owner_locale = state->GetString(prefs::kOwnerLocale);
     if (!owner_locale.empty() &&
         state->GetString(prefs::kApplicationLocale) != owner_locale &&
         !state->IsManagedPreference(prefs::kApplicationLocale)) {
       state->SetString(prefs::kApplicationLocale, owner_locale);
       state->SavePersistentPrefs();
     }
   }
   g_session_manager_requested_shutdown = false;
   if (FastShutdown())
     return;
 #else
   // Reset the restart bit that might have been set in cancelled restart
   // request.
   PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, false);
 #endif
-  AttemptExitInternal(restart);
+  AttemptExitInternal();
 }
 
 // static
 void BrowserList::AttemptRestart() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableRestoreSessionState)) {
     BrowserVector::const_iterator it;
     for (it = begin(); it != end(); ++it)
       (*it)->profile()->SaveSessionState();
   }
 
+  PrefService* pref_service = g_browser_process->local_state();
+  pref_service->SetBoolean(prefs::kWasRestarted, true);
+  pref_service->ScheduleSavePersistentPrefs();
+
 #if defined(OS_CHROMEOS)
   // For CrOS instead of browser restart (which is not supported) perform a full
   // sign out. Session will be only restored if user has that setting set.
   // Same session restore behavior happens in case of full restart after update.
-  AttemptUserExit(true);
+  AttemptUserExit();
 #else
   // Set the flag to restore state after the restart.
-  PrefService* pref_service = g_browser_process->local_state();
   pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
-  AttemptExit(true);
+  AttemptExit();
 #endif
 }
 
 // static
-void BrowserList::AttemptExit(bool restart) {
+void BrowserList::AttemptExit() {
   // If we know that all browsers can be closed without blocking,
   // don't notify users of crashes beyond this point.
   // Note that MarkAsCleanShutdown does not set UMA's exit cleanly bit
   // so crashes during shutdown are still reported in UMA.
   if (AreAllBrowsersCloseable())
     MarkAsCleanShutdown();
-  AttemptExitInternal(restart);
+  AttemptExitInternal();
 }
 
 #if defined(OS_CHROMEOS)
 // A function called when SIGTERM is received.
 // static
 void BrowserList::ExitCleanly() {
   // We always mark exit cleanly because SessionManager may kill
   // chrome in 3 seconds after SIGTERM.
   g_browser_process->EndSession();
 
   // Don't block when SIGTERM is received. AreaAllBrowsersCloseable()
   // can be false in following cases. a) power-off b) signout from
   // screen locker.
   if (!AreAllBrowsersCloseable())
     browser_shutdown::OnShutdownStarting(browser_shutdown::END_SESSION);
-  AttemptExitInternal(false);
+  AttemptExitInternal();
 }
 #endif
 
 // static
 void BrowserList::SessionEnding() {
   // This is a time-limited shutdown where we need to write as much to
   // disk as we can as soon as we can, and where we must kill the
   // process within a hang timeout to avoid user prompts.
 
   // Start watching for hang during shutdown, and crash it if takes too long.
@@ skipping 289 matching lines @@
   // If no more TabContents from Browsers, check the BackgroundPrintingManager.
   while (bg_printing_iterator_ != GetBackgroundPrintingManager()->end()) {
     cur_ = *bg_printing_iterator_;
     CHECK(cur_);
     ++bg_printing_iterator_;
     return;
   }
   // Reached the end - no more TabContents.
   cur_ = NULL;
 }