Index: components/content_settings/core/browser/host_content_settings_map.h |
diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h |
index 9115c2836a932b70c52fada8c8d6c27a991f454e..f1e45e2c0bf07721c599fb198e5879b8bc973c9c 100644 |
--- a/components/content_settings/core/browser/host_content_settings_map.h |
+++ b/components/content_settings/core/browser/host_content_settings_map.h |
@@ -278,6 +278,16 @@ class HostContentSettingsMap : public content_settings::Observer, |
// Passes ownership of |clock|. |
void SetPrefClockForTesting(std::unique_ptr<base::Clock> clock); |
+ // Migrate old domain scoped ALLOW settings to be origin scoped for |
+ // ContentSettingsTypes which are domain scoped. Only narrow down ALLOW |
+ // domain settings to origins so that this will not cause privacy/security |
+ // issues. |
+ // TODO(lshang): https://crbug.com/621398 Remove this when clients have |
+ // migrated (~M56). |
+ void MigrateDomainScopedSettings(); |
+ |
+ base::WeakPtr<HostContentSettingsMap> GetWeakPtr(); |
raymes
2016/07/19 01:48:49
the order of these functions in the .cc file shoul
lshang
2016/07/20 08:36:01
Done.
I put GetWeakPtr() behind MigrateDomainScop
|
+ |
private: |
friend class base::RefCountedThreadSafe<HostContentSettingsMap>; |
friend class HostContentSettingsMapTest_MigrateDomainScopedSettings_Test; |
@@ -312,14 +322,6 @@ class HostContentSettingsMap : public content_settings::Observer, |
// leave in some code to remove old-format settings for a long time. |
void MigrateKeygenSettings(); |
- // Migrate old domain scoped ALLOW settings to be origin scoped for |
- // ContentSettingsTypes which are domain scoped. Only narrow down ALLOW |
- // domain settings to origins so that this will not cause privacy/security |
- // issues. |
- // TODO(lshang): https://crbug.com/621398 Remove this when clients have |
- // migrated (~M56). |
- void MigrateDomainScopedSettings(); |
- |
// Collect UMA data about the number of exceptions. |
void RecordNumberOfExceptions(); |
@@ -396,6 +398,8 @@ class HostContentSettingsMap : public content_settings::Observer, |
base::ObserverList<content_settings::Observer> observers_; |
+ base::WeakPtrFactory<HostContentSettingsMap> weak_ptr_factory_; |
+ |
DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap); |
}; |