commit 03218cd40b150a60ee6bddd99bf73d8500a27681
author torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Aug 30 13:54:02 2011
committer torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Aug 30 13:54:02 2011
tree 4b0a4eccad876768acd7014b5c57a579964e2eb2
parent 94a1e9050726afa2ec96ac119ee818573059fc8a

Move multiprofile pref migration preference.
    
Move the registration of kMultipleProfilePrefMigration to be in the same
file where it is used. Also, remove redundant DCHECKs (the preference
service will already hit NOTREACHED in this code if the prefs in
question do not exist).


Review URL: http://codereview.chromium.org/7670063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98809 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 3307aa1..3d26106 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -93,6 +93,7 @@
 
 void RegisterLocalState(PrefService* local_state) {
   // Prefs in Local State
+  local_state->RegisterIntegerPref(prefs::kMultipleProfilePrefMigration, 0);
   AppsPromo::RegisterPrefs(local_state);
   Browser::RegisterPrefs(local_state);
   FlagsUI::RegisterPrefs(local_state);
@@ -194,7 +195,6 @@
   if ((current_version & WINDOWS_PREFS) == 0) {
     // Migrate the devtools split location preference.
     local_state->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1);
-    DCHECK(user_prefs->FindPreference(prefs::kDevToolsSplitLocation));
     if (local_state->HasPrefPath(prefs::kDevToolsSplitLocation)) {
       user_prefs->SetInteger(prefs::kDevToolsSplitLocation,
           local_state->GetInteger(prefs::kDevToolsSplitLocation));
@@ -203,7 +203,6 @@
 
     // Migrate the browser window placement preference.
     local_state->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
-    DCHECK(user_prefs->FindPreference(prefs::kBrowserWindowPlacement));
     if (local_state->HasPrefPath(prefs::kBrowserWindowPlacement)) {
       const PrefService::Preference* pref =
           local_state->FindPreference(prefs::kBrowserWindowPlacement);