Refactor preference syncing.

chrome/browser/prefs/pref_value_store.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/pref_value_store.h"
 
+#include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_notifier.h"
 
 PrefValueStore::PrefStoreKeeper::PrefStoreKeeper()
     : pref_value_store_(NULL),
       type_(PrefValueStore::INVALID_STORE) {
 }
 
 PrefValueStore::PrefStoreKeeper::~PrefStoreKeeper() {
   if (pref_store_.get()) {
     pref_store_->RemoveObserver(this);
@@ skipping 25 matching lines @@
 }
 
 PrefValueStore::PrefValueStore(PrefStore* managed_platform_prefs,
                                PrefStore* managed_cloud_prefs,
                                PrefStore* extension_prefs,
                                PrefStore* command_line_prefs,
                                PrefStore* user_prefs,
                                PrefStore* recommended_platform_prefs,
                                PrefStore* recommended_cloud_prefs,
                                PrefStore* default_prefs,
+                               PrefModelAssociator* pref_sync_associator,
                                PrefNotifier* pref_notifier)
-    : pref_notifier_(pref_notifier) {
+    : pref_sync_associator_(pref_sync_associator),
+      pref_notifier_(pref_notifier) {
   InitPrefStore(MANAGED_PLATFORM_STORE, managed_platform_prefs);
   InitPrefStore(MANAGED_CLOUD_STORE, managed_cloud_prefs);
   InitPrefStore(EXTENSION_STORE, extension_prefs);
   InitPrefStore(COMMAND_LINE_STORE, command_line_prefs);
   InitPrefStore(USER_STORE, user_prefs);
   InitPrefStore(RECOMMENDED_PLATFORM_STORE, recommended_platform_prefs);
   InitPrefStore(RECOMMENDED_CLOUD_STORE, recommended_cloud_prefs);
   InitPrefStore(DEFAULT_STORE, default_prefs);
 
   CheckInitializationCompleted();
 }
 
 PrefValueStore::~PrefValueStore() {}
 
 PrefValueStore* PrefValueStore::CloneAndSpecialize(
     PrefStore* managed_platform_prefs,
     PrefStore* managed_cloud_prefs,
     PrefStore* extension_prefs,
     PrefStore* command_line_prefs,
     PrefStore* user_prefs,
     PrefStore* recommended_platform_prefs,
     PrefStore* recommended_cloud_prefs,
     PrefStore* default_prefs,
+    PrefModelAssociator* pref_sync_associator,
     PrefNotifier* pref_notifier) {
   DCHECK(pref_notifier);
   if (!managed_platform_prefs)
     managed_platform_prefs = GetPrefStore(MANAGED_PLATFORM_STORE);
   if (!managed_cloud_prefs)
     managed_cloud_prefs = GetPrefStore(MANAGED_CLOUD_STORE);
   if (!extension_prefs)
     extension_prefs = GetPrefStore(EXTENSION_STORE);
   if (!command_line_prefs)
     command_line_prefs = GetPrefStore(COMMAND_LINE_STORE);
   if (!user_prefs)
     user_prefs = GetPrefStore(USER_STORE);
   if (!recommended_platform_prefs)
     recommended_platform_prefs = GetPrefStore(RECOMMENDED_PLATFORM_STORE);
   if (!recommended_cloud_prefs)
     recommended_cloud_prefs = GetPrefStore(RECOMMENDED_CLOUD_STORE);
   if (!default_prefs)
     default_prefs = GetPrefStore(DEFAULT_STORE);
 
   return new PrefValueStore(
       managed_platform_prefs, managed_cloud_prefs, extension_prefs,
       command_line_prefs, user_prefs, recommended_platform_prefs,
-      recommended_cloud_prefs, default_prefs,
+      recommended_cloud_prefs, default_prefs, pref_sync_associator,
       pref_notifier);
 }
 
 bool PrefValueStore::GetValue(const std::string& name,
                               Value::ValueType type,
                               const Value** out_value) const {
   *out_value = NULL;
   // Check the |PrefStore|s in order of their priority from highest to lowest
   // to find the value of the preference described by the given preference name.
   for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) {
@@ skipping 12 matching lines @@
 }
 
 void PrefValueStore::NotifyPrefChanged(
     const char* path,
     PrefValueStore::PrefStoreType new_store) {
   DCHECK(new_store != INVALID_STORE);
 
   // If the pref is controlled by a higher-priority store, its effective value
   // cannot have changed.
   PrefStoreType controller = ControllingPrefStoreForPref(path);
-  if (controller == INVALID_STORE || controller >= new_store)
+  if (controller == INVALID_STORE || controller >= new_store) {
     pref_notifier_->OnPreferenceChanged(path);
+    if (pref_sync_associator_)
+      pref_sync_associator_->ProcessPrefChange(path);
+  }
 }
 
 bool PrefValueStore::PrefValueInManagedStore(const char* name) const {
   return PrefValueInStore(name, MANAGED_PLATFORM_STORE) ||
          PrefValueInStore(name, MANAGED_CLOUD_STORE);
 }
 
 bool PrefValueStore::PrefValueInExtensionStore(const char* name) const {
   return PrefValueInStore(name, EXTENSION_STORE);
 }
@@ skipping 105 matching lines @@
 
 void PrefValueStore::CheckInitializationCompleted() {
   for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) {
     scoped_refptr<PrefStore> store =
         GetPrefStore(static_cast<PrefStoreType>(i));
     if (store && !store->IsInitializationComplete())
       return;
   }
   pref_notifier_->OnInitializationCompleted();
 }