Adjust preference sync code to only sync user modifiable preferences.

chrome/browser/pref_service.cc

 // 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/pref_service.h"
 
 #include <algorithm>
 #include <string>
 
 #include "app/l10n_util.h"
@@ skipping 403 matching lines @@
   }
   return false;
 }
 
 void PrefService::FireObserversIfChanged(const wchar_t* path,
                                          const Value* old_value) {
   if (PrefIsChanged(path, old_value))
     FireObservers(path);
 }
 
+void PrefService::FireObservers(const wchar_t* path) {
+  DCHECK(CalledOnValidThread());
+
+  // Convert path to a std::wstring because the Details constructor requires a
+  // class.
+  std::wstring path_str(path);
+  PrefObserverMap::iterator observer_iterator = pref_observers_.find(path_str);
+  if (observer_iterator == pref_observers_.end())
+    return;
+
+  NotificationObserverList::Iterator it(*(observer_iterator->second));
+  NotificationObserver* observer;
+  while ((observer = it.GetNext()) != NULL) {
+    observer->Observe(NotificationType::PREF_CHANGED,
+                      Source<PrefService>(this),
+                      Details<std::wstring>(&path_str));
+  }
+}
+
 bool PrefService::PrefIsChanged(const wchar_t* path,
                                 const Value* old_value) {
   Value* new_value = NULL;
   pref_value_store_->GetValue(path, &new_value);
   // Some unit tests have no values for certain prefs.
   return (!new_value || !old_value->Equals(new_value));
 }
 
 const DictionaryValue* PrefService::GetDictionary(const wchar_t* path) const {
   DCHECK(CalledOnValidThread());
@@ skipping 350 matching lines @@
 }
 
 Value* PrefService::GetPrefCopy(const wchar_t* path) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   DCHECK(pref);
   return pref->GetValue()->DeepCopy();
 }
 
-void PrefService::FireObservers(const wchar_t* path) {
-  DCHECK(CalledOnValidThread());
-
-  // Convert path to a std::wstring because the Details constructor requires a
-  // class.
-  std::wstring path_str(path);
-  PrefObserverMap::iterator observer_iterator = pref_observers_.find(path_str);
-  if (observer_iterator == pref_observers_.end())
-    return;
-
-  NotificationObserverList::Iterator it(*(observer_iterator->second));
-  NotificationObserver* observer;
-  while ((observer = it.GetNext()) != NULL) {
-    observer->Observe(NotificationType::PREF_CHANGED,
-                      Source<PrefService>(this),
-                      Details<std::wstring>(&path_str));
-  }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // PrefService::Preference
 
 PrefService::Preference::Preference(PrefValueStore* pref_value_store,
                                     const wchar_t* name,
                                     Value* default_value)
       : type_(Value::TYPE_NULL),
         name_(name),
         default_value_(default_value),
         pref_value_store_(pref_value_store) {
@@ skipping 42 matching lines @@
   return pref_value_store_->PrefValueInUserStore(name_.c_str());
 }
 
 bool PrefService::Preference::IsExtensionControlled() const {
   return pref_value_store_->PrefValueFromExtensionStore(name_.c_str());
 }
 
 bool PrefService::Preference::IsUserControlled() const {
   return pref_value_store_->PrefValueFromUserStore(name_.c_str());
 }
+
+bool PrefService::Preference::IsUserModifiable() const {
+  return pref_value_store_->PrefValueUserModifiable(name_.c_str());
+}