Refactor preference syncing.

chrome/browser/prefs/browser_prefs.cc

 // Copyright (c) 2011 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/browser_prefs.h"
 
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/background_mode_manager.h"
@@ skipping 156 matching lines @@
 }
 
 void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state) {
   // Copy pref values which have been migrated to user_prefs from local_state,
   // or remove them from local_state outright, if copying is not required.
   int current_version =
       local_state->GetInteger(prefs::kMultipleProfilePrefMigration);
 
   if ((current_version & WINDOWS_PREFS) == 0) {
     // Migrate the devtools split location preference.
-    local_state->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1);
+    local_state->RegisterIntegerPref(prefs::kDevToolsSplitLocation,
+                                     -1,
+                                     false /* don't sync pref */);
     DCHECK(user_prefs->FindPreference(prefs::kDevToolsSplitLocation));
     if (local_state->HasPrefPath(prefs::kDevToolsSplitLocation)) {
       user_prefs->SetInteger(prefs::kDevToolsSplitLocation,
           local_state->GetInteger(prefs::kDevToolsSplitLocation));
     }
     local_state->ClearPref(prefs::kDevToolsSplitLocation);
 
     // Migrate the browser window placement preference.
-    local_state->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
+    local_state->RegisterDictionaryPref(prefs::kBrowserWindowPlacement,
+                                        false /* don't sync pref */);
     DCHECK(user_prefs->FindPreference(prefs::kBrowserWindowPlacement));
     if (local_state->HasPrefPath(prefs::kBrowserWindowPlacement)) {
       const PrefService::Preference* pref =
           local_state->FindPreference(prefs::kBrowserWindowPlacement);
       DCHECK(pref);
       user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue()));
     }
     local_state->ClearPref(prefs::kBrowserWindowPlacement);
 
     local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
                             current_version | WINDOWS_PREFS);
   }
 }
 
 }  // namespace browser