Fixes for the kWasRestarted pref.

chrome/browser/ui/browser_init.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_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 317 matching lines @@
                        const PrefService* prefs) {
   IncognitoModePrefs::Availability incognito_avail =
       IncognitoModePrefs::GetAvailability(prefs);
   return incognito_avail != IncognitoModePrefs::DISABLED &&
          (command_line.HasSwitch(switches::kIncognito) ||
           incognito_avail == IncognitoModePrefs::FORCED);
 }
 
 SessionStartupPref GetSessionStartupPref(const CommandLine& command_line,
                                          Profile* profile) {
-  PrefService* pref_service = g_browser_process->local_state();
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile);
   if (command_line.HasSwitch(switches::kRestoreLastSession) ||
-      pref_service->GetBoolean(prefs::kWasRestarted)) {
+      BrowserInit::WasRestarted()) {
     pref.type = SessionStartupPref::LAST;
   }
   if (pref.type == SessionStartupPref::LAST &&
       IncognitoIsForced(command_line, profile->GetPrefs())) {
     // We don't store session information when incognito. If the user has
     // chosen to restore last session and launched incognito, fallback to
     // default launch behavior.
     pref.type = SessionStartupPref::DEFAULT;
   }
   return pref;
@@ skipping 140 matching lines @@
     g_browser_process->crl_set_fetcher()->StartInitialLoad(cus);
 
   cus->Start();
 }
 
 }  // namespace
 
 
 // BrowserInit ----------------------------------------------------------------
 
+bool BrowserInit::was_restarted_ = false;

[sky, 2011/12/13 16:54:42]

Since these are only used in WasRestarted, why not make them static there?

+bool BrowserInit::was_restarted_read_ = false;
+
 BrowserInit::BrowserInit() {}
 
 BrowserInit::~BrowserInit() {}
 
 void BrowserInit::AddFirstRunTab(const GURL& url) {
   first_run_tabs_.push_back(url);
 }
 
 // static
 bool BrowserInit::InProcessStartup() {
@@ skipping 66 matching lines @@
         new chromeos::SmsObserver(profile);
     chromeos::CrosLibrary::Get()->GetNetworkLibrary()
         ->AddNetworkManagerObserver(sms_observer);
 
     profile->SetupChromeOSEnterpriseExtensionObserver();
   }
 #endif
   return true;
 }
 
+// static
+bool BrowserInit::WasRestarted() {
+  if (!was_restarted_read_) {
+    PrefService* pref_service = g_browser_process->local_state();
+    was_restarted_ = pref_service->GetBoolean(prefs::kWasRestarted);
+    pref_service->SetBoolean(prefs::kWasRestarted, false);
+    pref_service->ScheduleSavePersistentPrefs();
+    was_restarted_read_ = true;
+  }
+  return was_restarted_;
+}
 
 // BrowserInit::LaunchWithProfile::Tab ----------------------------------------
 
 BrowserInit::LaunchWithProfile::Tab::Tab() : is_app(false), is_pinned(true) {}
 
 BrowserInit::LaunchWithProfile::Tab::~Tab() {}
 
 
 // BrowserInit::LaunchWithProfile ---------------------------------------------
 
@@ skipping 927 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, NULL, NULL);
 }