Clean up pref change notification handling.

chrome/browser/extensions/extension_prefs.cc

Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 112a2df0b20521c82e408ddf277cd1561fbb1572..4e897b3c4673d18a8e5ec651cad0e2d196662a3f 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -334,7 +334,9 @@ void ExtensionPrefs::AddToExtensionPrefStringSet(
 
 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) {
@@ -1242,10 +1244,8 @@ void ExtensionPrefs::UpdatePrefStore(const std::string& pref_key) {
     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,