| Index: chrome/browser/content_settings/host_content_settings_map.h
|
| diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
|
| index 816b746220a9589239cb3ae35d31a2020b4d90f0..50265cdf262e5b5d105edd58b5413e8b9703582d 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map.h
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.h
|
| @@ -38,8 +38,7 @@ class Profile;
|
|
|
| class HostContentSettingsMap
|
| : public NotificationObserver,
|
| - public base::RefCountedThreadSafe<HostContentSettingsMap,
|
| - BrowserThread::DeleteOnUIThread> {
|
| + public base::RefCountedThreadSafe<HostContentSettingsMap> {
|
| public:
|
| typedef Tuple3<ContentSettingsPattern, ContentSetting, std::string>
|
| PatternSettingSourceTriple;
|
| @@ -199,8 +198,7 @@ class HostContentSettingsMap
|
| const NotificationDetails& details);
|
|
|
| private:
|
| - friend struct BrowserThread::DeleteOnThread<BrowserThread::UI>;
|
| - friend class DeleteTask<HostContentSettingsMap>;
|
| + friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
|
|
|
| virtual ~HostContentSettingsMap();
|
|
|
| @@ -210,16 +208,13 @@ class HostContentSettingsMap
|
| ContentSettingsType content_type,
|
| const std::string& resource_identifier) const;
|
|
|
| - void UnregisterObservers();
|
| -
|
| // Various migration methods (old cookie, popup and per-host data gets
|
| // migrated to the new format).
|
| - void MigrateObsoleteCookiePref(PrefService* prefs);
|
| + void MigrateObsoleteCookiePref();
|
|
|
| - // The profile we're associated with.
|
| - Profile* profile_;
|
| + // Weak; owned by the Profile.
|
| + PrefService* prefs_;
|
|
|
| - NotificationRegistrar notification_registrar_;
|
| PrefChangeRegistrar pref_change_registrar_;
|
|
|
| // Whether this settings map is for an OTR session.
|
|
|