Migrate startup URLs pref.

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/time/time.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/window_restore_utils.h"
@@ skipping 35 matching lines @@
 
 // static
 void SessionStartupPref::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kRestoreOnStartup,
       TypeToPrefValue(GetDefaultStartupType()),
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterListPref(prefs::kURLsToRestoreOnStartup,
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+  registry->RegisterListPref(prefs::kURLsToRestoreOnStartupOld,
+                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kRestoreOnStartupMigrated,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterDoublePref(
+      prefs::kRestoreStartupURLsMigrated,
+      false,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
 SessionStartupPref::Type SessionStartupPref::GetDefaultStartupType() {
 #if defined(OS_CHROMEOS)
   return SessionStartupPref::LAST;
 #else
   return SessionStartupPref::DEFAULT;
 #endif
 }
@@ skipping 50 matching lines @@
   const ListValue* url_list = prefs->GetList(prefs::kURLsToRestoreOnStartup);
   URLListToPref(url_list, &pref);
 
   return pref;
 }
 
 // static
 void SessionStartupPref::MigrateIfNecessary(PrefService* prefs) {
   DCHECK(prefs);
 
+  if (!prefs->GetUserPrefValue(prefs::kRestoreStartupURLsMigrated)) {
+    // Read existing values.
+    const base::Value* startup_urls =
+        prefs->GetUserPrefValue(prefs::kURLsToRestoreOnStartupOld);
+    if (startup_urls)
+      prefs->Set(prefs::kURLsToRestoreOnStartup, *startup_urls);
+  }
+
   if (!prefs->GetBoolean(prefs::kRestoreOnStartupMigrated)) {
-    // Read existing values
+    // Read existing values.
     const base::Value* homepage_is_new_tab_page_value =
         prefs->GetUserPrefValue(prefs::kHomePageIsNewTabPage);
     bool homepage_is_new_tab_page = true;
     if (homepage_is_new_tab_page_value) {
       if (!homepage_is_new_tab_page_value->GetAsBoolean(
               &homepage_is_new_tab_page))
         NOTREACHED();
     }
 
     const base::Value* restore_on_startup_value =
@@ skipping 81 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() {}