Fix sync promo first run bugs

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/prefs/pref_service.h"
 #include "base/values.h"
@@ skipping 168 matching lines @@
 
 // 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");
+  bool old_profile_version =
+      !prefs->FindPreference(
+          prefs::kProfileCreatedByVersion)->IsDefaultValue() &&
+      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);
@@ skipping 25 matching lines @@
     case kPrefValueLast:     return SessionStartupPref::LAST;
     case kPrefValueURLs:     return SessionStartupPref::URLS;
     case kPrefValueHomePage: return SessionStartupPref::HOMEPAGE;
     default:                 return SessionStartupPref::DEFAULT;
   }
 }
 
 SessionStartupPref::SessionStartupPref(Type type) : type(type) {}
 
 SessionStartupPref::~SessionStartupPref() {}