Remove PrefValueStore's dependency on PrefModelAssociator.

chrome/browser/prefs/pref_value_store.cc

 // Copyright (c) 2012 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 "base/logging.h"
 #include "base/prefs/pref_notifier.h"
-#include "chrome/browser/prefs/pref_model_associator.h"
+#include "base/prefs/pref_observer.h"
 
 PrefValueStore::PrefStoreKeeper::PrefStoreKeeper()
     : pref_value_store_(NULL),
       type_(PrefValueStore::INVALID_STORE) {
 }
 
 PrefValueStore::PrefStoreKeeper::~PrefStoreKeeper() {
   if (pref_store_.get()) {
     pref_store_->RemoveObserver(this);
     pref_store_ = NULL;
@@ skipping 26 matching lines @@
   pref_value_store_->OnInitializationCompleted(type_, succeeded);
 }
 
 PrefValueStore::PrefValueStore(PrefStore* managed_prefs,
                                PrefStore* extension_prefs,
                                PrefStore* command_line_prefs,
                                PrefStore* user_prefs,
                                PrefStore* recommended_prefs,
                                PrefStore* default_prefs,
                                PrefNotifier* pref_notifier)
-    : pref_sync_associator_(NULL),
-      pref_notifier_(pref_notifier),
+    : pref_notifier_(pref_notifier),
       initialization_failed_(false) {
   InitPrefStore(MANAGED_STORE, managed_prefs);
   InitPrefStore(EXTENSION_STORE, extension_prefs);
   InitPrefStore(COMMAND_LINE_STORE, command_line_prefs);
   InitPrefStore(USER_STORE, user_prefs);
   InitPrefStore(RECOMMENDED_STORE, recommended_prefs);
   InitPrefStore(DEFAULT_STORE, default_prefs);
 
   CheckInitializationCompleted();
 }
@@ skipping 20 matching lines @@
   if (!recommended_prefs)
     recommended_prefs = GetPrefStore(RECOMMENDED_STORE);
   if (!default_prefs)
     default_prefs = GetPrefStore(DEFAULT_STORE);
 
   return new PrefValueStore(
       managed_prefs, extension_prefs, command_line_prefs, user_prefs,
       recommended_prefs, default_prefs, pref_notifier);
 }
 
-void PrefValueStore::set_sync_associator(PrefModelAssociator* sync_associator) {
-  pref_sync_associator_ = sync_associator;
+void PrefValueStore::set_callback(const PrefChangedCallback& callback) {
+  pref_changed_callback_ = callback;
 }
 
 bool PrefValueStore::GetValue(const std::string& name,
                               base::Value::Type type,
                               const Value** out_value) const {
   // Check the |PrefStore|s in order of their priority from highest to lowest,
   // looking for the first preference value with the given |name| and |type|.
   for (size_t i = 0; i <= PREF_STORE_TYPE_MAX; ++i) {
     if (GetValueFromStoreWithType(name.c_str(), type,
                                   static_cast<PrefStoreType>(i), out_value))
@@ skipping 10 matching lines @@
 }
 
 void PrefValueStore::NotifyPrefChanged(
     const char* path,
     PrefValueStore::PrefStoreType new_store) {
   DCHECK(new_store != INVALID_STORE);
   // A notification is sent when the pref value in any store changes. If this
   // store is currently being overridden by a higher-priority store, the
   // effective value of the pref will not have changed.
   pref_notifier_->OnPreferenceChanged(path);
-  if (pref_sync_associator_)
-    pref_sync_associator_->ProcessPrefChange(path);
+  if (!pref_changed_callback_.is_null())
+    pref_changed_callback_.Run(path);
 }
 
 bool PrefValueStore::PrefValueInManagedStore(const char* name) const {
   return PrefValueInStore(name, MANAGED_STORE);
 }
 
 bool PrefValueStore::PrefValueInExtensionStore(const char* name) const {
   return PrefValueInStore(name, EXTENSION_STORE);
 }
 
@@ skipping 126 matching lines @@
   if (initialization_failed_)
     return;
   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(true);
 }