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..6b0f04e88176a1c09b5d8c131648ce25256979f1 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_DomainToOriginMigrationStatus_Test; |
friend class HostContentSettingsMapTest_MigrateDomainScopedSettings_Test; |
friend class HostContentSettingsMapTest_MigrateKeygenSettings_Test; |
@@ -318,7 +319,7 @@ class HostContentSettingsMap : public content_settings::Observer, |
// issues. |
// TODO(lshang): https://crbug.com/621398 Remove this when clients have |
// migrated (~M56). |
- void MigrateDomainScopedSettings(); |
+ void MigrateDomainScopedSettings(bool after_sync); |
raymes
2016/07/21 00:58:54
nit: Please add a comment for |after_sync|
lshang
2016/07/22 01:33:07
Done.
|
// Collect UMA data about the number of exceptions. |
void RecordNumberOfExceptions(); |