Make the hcsm and its providers communicate via an observer interface.

chrome/browser/content_settings/content_settings_pref_provider.h

Index: chrome/browser/content_settings/content_settings_pref_provider.h
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/chrome/browser/content_settings/content_settings_pref_provider.h
index c30e4049b364308c1da58b3b99006eaa1d4056a2..a8f9d154d9702cfef7d19c2a32b68d65fdb1ed98 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.h
+++ b/chrome/browser/content_settings/content_settings_pref_provider.h
@@ -15,7 +15,7 @@
 #include "base/basictypes.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
-#include "chrome/browser/content_settings/content_settings_provider.h"
+#include "chrome/browser/content_settings/content_settings_abstract_provider.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/common/notification_observer.h"
@@ -99,17 +99,17 @@ class PrefDefaultProvider : public DefaultProviderInterface,
 
 // Content settings provider that provides content settings from the user
 // preference.
-class PrefProvider : public ProviderInterface,
+class PrefProvider : public AbstractProvider,
                      public NotificationObserver {
  public:
   static void RegisterUserPrefs(PrefService* prefs);
 
-  PrefProvider(HostContentSettingsMap* map,
+  PrefProvider(Observer* observer,
                PrefService* prefs,
                bool incognito);
   virtual ~PrefProvider();
 
-  // ProviderInterface implementations.
+  // AbstractProvider implementations.
   virtual void SetContentSetting(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
@@ -189,14 +189,9 @@ class PrefProvider : public ProviderInterface,
   static void CanonicalizeContentSettingsExceptions(
       DictionaryValue* all_settings_dictionary);
 
-  void NotifyObservers(const ContentSettingsDetails& details);
-
   // Weak; owned by the Profile and reset in ShutdownOnUIThread.
   PrefService* prefs_;
 
-  // Weak; owns us
-  HostContentSettingsMap* host_content_settings_map_;
-
   bool is_incognito_;
 
   PrefChangeRegistrar pref_change_registrar_;