Make ExtensionContentSettingsStore refcounted.

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 2bc8e96faec11213e7998533261540c9138ea612..d406f7e35392a0b58e7814356197dcbf951ed488 100644
--- a/chrome/browser/content_settings/content_settings_extension_provider.h
+++ b/chrome/browser/content_settings/content_settings_extension_provider.h
@@ -9,6 +9,7 @@
 #include "chrome/browser/extensions/extension_content_settings_store.h"
 
 class ContentSettingsDetails;
+class HostContentSettingsMap;
 class Profile;
 
 namespace content_settings {
@@ -17,7 +18,7 @@ namespace content_settings {
 class ExtensionProvider : public ProviderInterface,
                           public ExtensionContentSettingsStore::Observer {
  public:
-  ExtensionProvider(Profile* profile,
+  ExtensionProvider(HostContentSettingsMap* map,

[battre, 2011/07/06 09:12:05]

nit: For someone not familiar with the code, it would be helpful to describe the
roles of the parameters here.

[Bernhard Bauer, 2011/07/06 12:06:51]

I added comments to the member variables below.

                     ExtensionContentSettingsStore* extensions_settings,
                     bool incognito);
 
@@ -37,8 +38,6 @@ class ExtensionProvider : public ProviderInterface,
       const ResourceIdentifier& resource_identifier,
       ContentSetting content_setting) {}
 
-  // TODO(markusheintz): The UI needs a way to discover that these rules are
-  // managed by an extension.
   virtual void GetAllContentSettingsRules(
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
@@ -48,24 +47,22 @@ class ExtensionProvider : public ProviderInterface,
 
   virtual void ResetToDefaults() {}
 
+  virtual void ShutdownOnUIThread();
+
   // ExtensionContentSettingsStore::Observer methods:
   virtual void OnContentSettingChanged(const std::string& extension_id,
                                        bool incognito);
 
-  virtual void OnDestruction();
-
  private:
   void NotifyObservers(const ContentSettingsDetails& details);
 
-  // TODO(markusheintz): That's only needed to send Notifications about changed
-  // ContentSettings. This will be changed for all ContentSettingsProviders.
-  // The HCSM will become an Observer of the ContentSettings Provider and send
-  // out the Notifications itself.
-  Profile* profile_;
+  // TODO(markusheintz): Make the HCSM an Observer of the
+  // ContentSettingsProvider and send out the Notifications itself.
+  HostContentSettingsMap* map_;
 
   bool incognito_;
 
-  ExtensionContentSettingsStore* extensions_settings_;  // Weak Pointer
+  scoped_refptr<ExtensionContentSettingsStore> extensions_settings_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionProvider);
 };