Follow-up changes to http://codereview.chromium.org/8937001

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 486 matching lines @@
   }
 
   cus->Start();
 }
 
 }  // namespace
 
 
 // BrowserInit ----------------------------------------------------------------
 
-bool BrowserInit::was_restarted_ = false;
-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 68 matching lines @@
         ->AddNetworkManagerObserver(sms_observer);
 
     profile->SetupChromeOSEnterpriseExtensionObserver();
   }
 #endif
   return true;
 }
 
 // static
 bool BrowserInit::WasRestarted() {
-  if (!was_restarted_read_) {
+  // Stores the value of the preference kWasRestarted had when it was read.
+  static bool was_restarted = false;
+
+  // True if we have already read and reset the preference kWasRestarted.
+  static bool was_restarted_read = false;
+
+  if (!was_restarted_read) {
     PrefService* pref_service = g_browser_process->local_state();
-    was_restarted_ = pref_service->GetBoolean(prefs::kWasRestarted);
+    was_restarted = pref_service->GetBoolean(prefs::kWasRestarted);
     pref_service->SetBoolean(prefs::kWasRestarted, false);
     pref_service->ScheduleSavePersistentPrefs();
-    was_restarted_read_ = true;
+    was_restarted_read = true;
   }
-  return was_restarted_;
+  return was_restarted;
 }
 
 // BrowserInit::LaunchWithProfile::Tab ----------------------------------------
 
 BrowserInit::LaunchWithProfile::Tab::Tab() : is_app(false), is_pinned(true) {}
 
 BrowserInit::LaunchWithProfile::Tab::~Tab() {}
 
 
 // BrowserInit::LaunchWithProfile ---------------------------------------------
@@ skipping 928 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);
 }