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 ec33722e9996e4b9250274a0746a06ce9b1f436b..6614a2ebe61f5add9076f5a32788feeed3bf1282 100644 |
--- a/components/content_settings/core/browser/host_content_settings_map.h |
+++ b/components/content_settings/core/browser/host_content_settings_map.h |
@@ -280,6 +280,7 @@ class HostContentSettingsMap : public content_settings::Observer, |
private: |
friend class base::RefCountedThreadSafe<HostContentSettingsMap>; |
+ friend class HostContentSettingsMapTest_MigrateDomainScopedSettings_Test; |
friend class HostContentSettingsMapTest_MigrateKeygenSettings_Test; |
friend class content_settings::TestUtils; |
@@ -311,6 +312,11 @@ 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 there will not cause security issues. |
raymes
2016/06/16 03:23:51
security->privacy/security
lshang
2016/06/20 01:34:22
Done.
|
+ void MigrateDomainScopedSettings(); |
+ |
// Collect UMA data about the number of exceptions. |
void RecordNumberOfExceptions(); |