Explicitly ShutdownOnUIThread the HostContentSettingsMap when destroying the Profile.

chrome/browser/content_settings/content_settings_policy_provider.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_POLICY_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_POLICY_PROVIDER_H_
 #pragma once
 
 // A content settings provider that takes its settings out of policies.
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/synchronization/lock.h"
 #include "base/tuple.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/prefs/pref_change_registrar.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 class ContentSettingsDetails;
 class DictionaryValue;
+class HostContentSettingsMap;
 class PrefService;
-class Profile;
 
 namespace content_settings {
 
 class PolicyDefaultProvider : public DefaultProviderInterface,
                               public NotificationObserver {
  public:
-  explicit PolicyDefaultProvider(Profile* profile);
+  PolicyDefaultProvider(HostContentSettingsMap* map, PrefService* prefs);
   virtual ~PolicyDefaultProvider();
 
   // DefaultContentSettingsProvider implementation.
   virtual ContentSetting ProvideDefaultSetting(
       ContentSettingsType content_type) const;
   virtual void UpdateDefaultSetting(ContentSettingsType content_type,
                                     ContentSetting setting);
   virtual bool DefaultSettingIsManaged(ContentSettingsType content_type) const;
 
+  void ShutdownOnUIThread();
+
   static void RegisterUserPrefs(PrefService* prefs);
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   // Informs observers that content settings have changed. Make sure that
   // |lock_| is not held when calling this, as listeners will usually call one
   // of the GetSettings functions in response, which would then lead to a
   // mutex deadlock.
   void NotifyObservers(const ContentSettingsDetails& details);
 
-  void UnregisterObservers();
-
   // Reads the policy managed default settings.
   void ReadManagedDefaultSettings();
 
   // Reads the policy controlled default settings for a specific content type.
   void UpdateManagedDefaultSetting(ContentSettingsType content_type);
 
   // Copies of the pref data, so that we can read it on the IO thread.
   ContentSettings managed_default_content_settings_;
 
-  Profile* profile_;
-
-  // Whether this settings map is for an OTR session.
-  bool is_off_the_record_;
+  HostContentSettingsMap* map_;
+  PrefService* prefs_;
 
   // Used around accesses to the managed_default_content_settings_ object to
   // guarantee thread safety.
   mutable base::Lock lock_;
 
   PrefChangeRegistrar pref_change_registrar_;
   NotificationRegistrar notification_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyDefaultProvider);
 };
 
 // PolicyProvider that provider managed content-settings.
 class PolicyProvider : public ProviderInterface,
                        public NotificationObserver {
  public:
-  explicit PolicyProvider(Profile* profile,
-                          DefaultProviderInterface* default_provider);
+  PolicyProvider(HostContentSettingsMap* map,
+                 PrefService* prefs,
+                 DefaultProviderInterface* default_provider);
   virtual ~PolicyProvider();
   static void RegisterUserPrefs(PrefService* prefs);
 
   // ProviderInterface Implementation
-  virtual void Init();
-
   virtual void SetContentSetting(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       ContentSetting content_setting);
 
   virtual ContentSetting GetContentSetting(
       const GURL& primary_url,
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier) const;
 
   virtual void GetAllContentSettingsRules(
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       Rules* content_setting_rules) const;
 
   virtual void ClearAllContentSettingsRules(
       ContentSettingsType content_type);
 
+  virtual void ShutdownOnUIThread();
+
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
  private:
   typedef Tuple5<
       ContentSettingsPattern,
       ContentSettingsPattern,
       ContentSettingsType,
       ResourceIdentifier,
       ContentSetting> ContentSettingsRule;
 
   typedef std::vector<ContentSettingsRule> ContentSettingsRules;
 
   void ReadManagedContentSettings(bool overwrite);
 
-  void GetContentSettingsFromPreferences(PrefService* prefs,
-                                         ContentSettingsRules* rules);
+  void GetContentSettingsFromPreferences(ContentSettingsRules* rules);
 
-  void ReadManagedContentSettingsTypes(
-      ContentSettingsType content_type);
+  void ReadManagedContentSettingsTypes(ContentSettingsType content_type);
 
   void NotifyObservers(const ContentSettingsDetails& details);
 
-  void UnregisterObservers();
-
   OriginIdentifierValueMap value_map_;
 
-  Profile* profile_;
+  HostContentSettingsMap* map_;

[markusheintz_, 2011/07/07 15:23:18]

Maybe you should use a better name here.
e.g. host_content_settings_map. 

This way it is easier in the code to see which 'map' is used.

[Bernhard Bauer, 2011/07/08 17:05:27]

Done.

+  PrefService* prefs_;
 
   // Weak, owned by HostContentSettingsMap.
   DefaultProviderInterface* default_provider_;
 
   PrefChangeRegistrar pref_change_registrar_;
-  NotificationRegistrar notification_registrar_;
 
   // Used around accesses to the content_settings_ object to guarantee
   // thread safety.
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyProvider);
 };
 
 }  // namespace content_settings
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_POLICY_PROVIDER_H_