commit 7e6895cde4081c58a9c4804835c933a59b5413f6
author pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 14 16:29:46 2012
committer pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 14 16:29:46 2012
tree fe3fc594b4b6bdf56fe51ac46c3a56652fe94adb
parent 7d015e496c3148177ea0c502cd698121d955c37a

Combine pref migration passes into a single common function, in preparation for adding some more migrations.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9699004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126656 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 535730b6..c696741 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -247,8 +247,21 @@
   int current_version =
       local_state->GetInteger(prefs::kMultipleProfilePrefMigration);
 
-  if ((current_version & WINDOWS_PREFS) == 0) {
-    // Migrate the devtools split location preference.
+  if (!(current_version & DNS_PREFS)) {
+    local_state->RegisterListPref(prefs::kDnsStartupPrefetchList,
+                                  PrefService::UNSYNCABLE_PREF);
+    local_state->ClearPref(prefs::kDnsStartupPrefetchList);
+
+    local_state->RegisterListPref(prefs::kDnsHostReferralList,
+                                  PrefService::UNSYNCABLE_PREF);
+    local_state->ClearPref(prefs::kDnsHostReferralList);
+
+    current_version |= DNS_PREFS;
+    local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
+                            current_version);
+  }
+
+  if (!(current_version & WINDOWS_PREFS)) {
     local_state->RegisterIntegerPref(prefs::kDevToolsHSplitLocation, -1);
     if (local_state->HasPrefPath(prefs::kDevToolsHSplitLocation)) {
       user_prefs->SetInteger(prefs::kDevToolsHSplitLocation,
@@ -256,7 +269,6 @@
     }
     local_state->ClearPref(prefs::kDevToolsHSplitLocation);
 
-    // Migrate the browser window placement preference.
     local_state->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
     if (local_state->HasPrefPath(prefs::kBrowserWindowPlacement)) {
       const PrefService::Preference* pref =
@@ -266,8 +278,9 @@
     }
     local_state->ClearPref(prefs::kBrowserWindowPlacement);
 
+    current_version |= WINDOWS_PREFS;
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
-                            current_version | WINDOWS_PREFS);
+                            current_version);
   }
 }