Clean up pref change notification handling.

chrome/browser/extensions/extension_prefs.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/extensions/extension_prefs.h"
 
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_notifier.h"
@@ skipping 316 matching lines @@
   for (std::set<std::string>::const_iterator iter = new_value.begin();
        iter != new_value.end(); ++iter)
     value->Append(Value::CreateStringValue(*iter));
 
   UpdateExtensionPref(extension_id, pref_key, value);
   prefs_->ScheduleSavePersistentPrefs();
 }
 
 void ExtensionPrefs::SavePrefsAndNotify() {
   prefs_->ScheduleSavePersistentPrefs();
-  prefs_->pref_notifier()->OnUserPreferenceSet(kExtensionsPref);
+  // TODO(mnissler, danno): Don't use pref_notifier() here, but tell the
+  // PrefService by some other means that we changed the pref value.
+  prefs_->pref_notifier()->OnPreferenceChanged(kExtensionsPref);
 }
 
 bool ExtensionPrefs::IsBlacklistBitSet(DictionaryValue* ext) {
   return ReadBooleanFromPref(ext, kPrefBlacklist);
 }
 
 bool ExtensionPrefs::IsExtensionBlacklisted(const std::string& extension_id) {
   return ReadExtensionPrefBoolean(extension_id, kPrefBlacklist);
 }
 
@@ skipping 887 matching lines @@
   extension_pref_store->prefs()->Get(pref_key, &old_value);
   bool changed = !Value::Equals(winning_pref_value, old_value);
 
   if (winning_pref_value) {
     extension_pref_store->prefs()->Set(pref_key,
                                        winning_pref_value->DeepCopy());
   } else {
     extension_pref_store->prefs()->Remove(pref_key, NULL);
   }
 
-  if (changed) {
-    pref_service()->pref_notifier()->OnPreferenceSet(
-        pref_key.c_str(), PrefNotifier::EXTENSION_STORE);
-  }
+  if (changed)
+    pref_service()->pref_notifier()->OnPreferenceChanged(pref_key.c_str());
 }
 
 void ExtensionPrefs::SetExtensionControlledPref(const std::string& extension_id,
                                                 const std::string& pref_key,
                                                 Value* value) {
   DCHECK(pref_service()->FindPreference(pref_key.c_str()))
       << "Extension controlled preference key " << pref_key
       << " not registered.";
   DictionaryValue* extension_preferences =
       GetExtensionControlledPrefs(extension_id);
@@ skipping 39 matching lines @@
 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionsPref);
   prefs->RegisterListPref(kExtensionToolbar);
   prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize, -1);
   prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate);
   prefs->RegisterListPref(prefs::kExtensionInstallAllowList);
   prefs->RegisterListPref(prefs::kExtensionInstallDenyList);
   prefs->RegisterListPref(prefs::kExtensionInstallForceList);
   prefs->RegisterStringPref(kWebStoreLogin, std::string() /* default_value */);
 }