Cleanup & tests for the mac startup pref migration.

chrome/browser/prefs/session_startup_pref.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/prefs/session_startup_pref.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "base/version.h"
@@ skipping 103 matching lines @@
 SessionStartupPref SessionStartupPref::GetStartupPref(Profile* profile) {
   DCHECK(profile);
   return GetStartupPref(profile->GetPrefs());
 }
 
 // static
 SessionStartupPref SessionStartupPref::GetStartupPref(PrefService* prefs) {
   DCHECK(prefs);
 
   MigrateIfNecessary(prefs);
-
-#if defined(OS_MACOSX)
-  if (restore_utils::IsWindowRestoreEnabled())
-    MigrateMacDefaultPrefIfNecessary(prefs);
-#endif
+  MigrateMacDefaultPrefIfNecessary(prefs);
 
   SessionStartupPref pref(
       PrefValueToType(prefs->GetInteger(prefs::kRestoreOnStartup)));
 
   // Always load the urls, even if the pref type isn't URLS. This way the
   // preferences panels can show the user their last choice.
   const ListValue* url_list = prefs->GetList(prefs::kURLsToRestoreOnStartup);
   URLListToPref(url_list, &pref);
 
   return pref;
@@ skipping 42 matching lines @@
       prefs->SetInteger(prefs::kRestoreOnStartup, kPrefValueURLs);
       SetNewURLList(prefs);
     }
 
     prefs->SetBoolean(prefs::kRestoreOnStartupMigrated, true);
   }
 }
 
 // static
 void SessionStartupPref::MigrateMacDefaultPrefIfNecessary(PrefService* prefs) {
+#if defined(OS_MACOSX)
   DCHECK(prefs);
+  if (!restore_utils::IsWindowRestoreEnabled())
+    return;
   // The default startup pref used to be LAST, now it is DEFAULT. Don't change
   // the setting for existing profiles (even if the user has never changed it),
   // but make new profiles default to DEFAULT.
   bool old_profile_version = Version(prefs->GetString(
       prefs::kProfileCreatedByVersion)).IsOlderThan("21.0.1180.0");
   if (old_profile_version && TypeIsDefault(prefs))
     prefs->SetInteger(prefs::kRestoreOnStartup, kPrefValueLast);
+#endif
 }
 
 // static
 bool SessionStartupPref::TypeIsManaged(PrefService* prefs) {
   DCHECK(prefs);
   const PrefService::Preference* pref_restore =
       prefs->FindPreference(prefs::kRestoreOnStartup);
   DCHECK(pref_restore);
   return pref_restore->IsManaged();
 }
@@ skipping 49 matching lines @@
   CHECK(prefs_watcher->GetBackupForPref(
             prefs::kURLsToRestoreOnStartup)->GetAsList(&url_list));
   URLListToPref(url_list, &backup_pref);
 
   return backup_pref;
 }
 
 SessionStartupPref::SessionStartupPref(Type type) : type(type) {}
 
 SessionStartupPref::~SessionStartupPref() {}