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

chrome/browser/content_settings/content_settings_extension_provider.h

Index: chrome/browser/content_settings/content_settings_extension_provider.h
diff --git a/chrome/browser/content_settings/content_settings_extension_provider.h b/chrome/browser/content_settings/content_settings_extension_provider.h
index e1bfc27ac3aa1a7b42f602c0d553ed8ccffc5c2b..0d3fa3127fcc25563686d04e8a46472e96e69bfb 100644
--- a/chrome/browser/content_settings/content_settings_extension_provider.h
+++ b/chrome/browser/content_settings/content_settings_extension_provider.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/content_settings/content_settings_provider.h"
+#include "chrome/browser/content_settings/content_settings_abstract_provider.h"
 #include "chrome/browser/extensions/extension_content_settings_store.h"
 
 class ContentSettingsDetails;
@@ -16,17 +16,19 @@ class Profile;
 
 namespace content_settings {
 
+class Observer;
+
 // A content settings provider which manages settings defined by extensions.
-class ExtensionProvider : public ProviderInterface,
+class ExtensionProvider : public AbstractProvider,
                           public ExtensionContentSettingsStore::Observer {
  public:
-  ExtensionProvider(HostContentSettingsMap* map,
+  ExtensionProvider(content_settings::Observer* observer,

[Bernhard Bauer, 2011/07/13 07:58:18]

Nit: Namespace content_settings is unnecessary.

[markusheintz_, 2011/07/13 12:48:16]

I need it here since the name otherwise collides with the
ExtensionContentSettingsStore::Observer

                     ExtensionContentSettingsStore* extensions_settings,
                     bool incognito);
 
   virtual ~ExtensionProvider();
 
-  // ProviderInterface methods:
+  // AbstractProvider methods:

[Bernhard Bauer, 2011/07/13 07:58:18]

Nit: I think you could leave this comment as "ProviderInterface", because that's
how these methods will be called.

[markusheintz_, 2011/07/13 12:48:16]

Done. I also changed this comment in all the other providers.

   virtual ContentSetting GetContentSetting(
       const GURL& embedded_url,
       const GURL& top_level_url,
@@ -56,14 +58,6 @@ class ExtensionProvider : public ProviderInterface,
                                        bool incognito);
 
  private:
-  void NotifyObservers(const ContentSettingsDetails& details);
-
-  // The HostContentSettingsMap this provider belongs to. It is only
-  // used as the source for notifications.
-  // TODO(markusheintz): Make the HCSM an Observer of the
-  // ContentSettingsProvider and send out the Notifications itself.
-  HostContentSettingsMap* map_;
-
   // Specifies whether this provider manages settings for incognito or regular
   // sessions.
   bool incognito_;