Adjust preference sync code to only sync user modifiable preferences.

chrome/browser/sync/glue/preference_change_processor.cc

-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/sync/glue/preference_change_processor.h"
 
 #include <set>
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/utf_string_conversions.h"
@@ skipping 29 matching lines @@
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   DCHECK(running());
   DCHECK(NotificationType::PREF_CHANGED == type);
   DCHECK_EQ(pref_service_, Source<PrefService>(source).ptr());
 
   std::wstring* name = Details<std::wstring>(details).ptr();
   const PrefService::Preference* preference =
       pref_service_->FindPreference((*name).c_str());
   DCHECK(preference);
 
-  // TODO(mnissler): Detect preference->IsManaged() state changes here and call
-  // into PreferenceModelAssociator to associate/disassociate sync nodes when
-  // the state changes.
+  // TODO(mnissler): Detect preference->IsUserControlled() state changes here
+  // and call into PreferenceModelAssociator to associate/disassociate sync
+  // nodes when the state changes.
 
-  // Do not pollute sync data with values coming from policy.
-  if (preference->IsManaged())
+  // Do not pollute sync data with values coming from policy, extensions or the
+  // commandline.
+  if (!preference->IsUserModifiable())
     return;
 
   sync_api::WriteTransaction trans(share_handle());
   sync_api::WriteNode node(&trans);
 
   // Since we don't create sync nodes for preferences that still have
   // their default values, this changed preference may not have a sync
   // node yet.  If not, create it.
   int64 sync_id = model_associator_->GetSyncIdFromChromeId(*name);
   if (sync_api::kInvalidId == sync_id) {
@@ skipping 67 matching lines @@
 
     // It is possible that we may receive a change to a preference we
     // do not want to sync.  For example if the user is syncing a Mac
     // client and a Windows client, the Windows client does not
     // support kShowPageOptionsButtons.  Ignore updates from these
     // preferences.
     const wchar_t* pref_name = name.c_str();
     if (model_associator_->synced_preferences().count(pref_name) == 0)
       continue;
 
-    // Don't try to overwrite preferences controlled by policy.
+    // Don't try to overwrite preferences not controllable by the user.
     const PrefService::Preference* pref =
         pref_service_->FindPreference(pref_name);
     DCHECK(pref);
-    if (pref->IsManaged())
+    if (!pref->IsUserModifiable())
       continue;
 
     if (sync_api::SyncManager::ChangeRecord::ACTION_DELETE ==
         changes[i].action) {
       pref_service_->ClearPref(pref_name);
     } else {
       pref_service_->Set(pref_name, *value);
 
       // If this is a newly added node, associate.
       if (sync_api::SyncManager::ChangeRecord::ACTION_ADD ==
@@ skipping 51 matching lines @@
 void PreferenceChangeProcessor::StopObserving() {
   DCHECK(pref_service_);
   for (std::set<std::wstring>::const_iterator it =
       model_associator_->synced_preferences().begin();
       it != model_associator_->synced_preferences().end(); ++it) {
     pref_service_->RemovePrefObserver((*it).c_str(), this);
   }
 }
 
 }  // namespace browser_sync