Cleanup & tests for the mac startup pref migration.

chrome/browser/prefs/session_startup_pref.cc

Index: chrome/browser/prefs/session_startup_pref.cc
diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc
index bbe96c9e5b725b9044b9d6767d89dfeb3e957cbd..5738b6e8d4a2f79775561efa51dbb99c971e8f64 100644
--- a/chrome/browser/prefs/session_startup_pref.cc
+++ b/chrome/browser/prefs/session_startup_pref.cc
@@ -121,11 +121,7 @@ SessionStartupPref SessionStartupPref::GetStartupPref(PrefService* prefs) {
   DCHECK(prefs);
 
   MigrateIfNecessary(prefs);
-
-#if defined(OS_MACOSX)
-  if (restore_utils::IsWindowRestoreEnabled())
-    MigrateMacDefaultPrefIfNecessary(prefs);
-#endif
+  MigrateMacDefaultPrefIfNecessary(prefs);

[Ivan Korotkov, 2012/06/29 16:33:56]

Why not simply move this call to MigrateIfNecessary?

[marja, 2012/07/03 13:36:49]

I'd like to keep the 2 migrations separate, e.g., they are not necessarily
removed at the same time.

 
   SessionStartupPref pref(
       PrefValueToType(prefs->GetInteger(prefs::kRestoreOnStartup)));
@@ -188,7 +184,10 @@ void SessionStartupPref::MigrateIfNecessary(PrefService* prefs) {
 
 // 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.
@@ -196,6 +195,7 @@ void SessionStartupPref::MigrateMacDefaultPrefIfNecessary(PrefService* prefs) {
       prefs::kProfileCreatedByVersion)).IsOlderThan("21.0.1180.0");
   if (old_profile_version && TypeIsDefault(prefs))
     prefs->SetInteger(prefs::kRestoreOnStartup, kPrefValueLast);
+#endif
 }
 
 // static