components/content_settings/core/browser/host_content_settings_map.h - Issue 2158743002: Register a pref to control migration status

Unified Diff: components/content_settings/core/browser/host_content_settings_map.h

Issue 2158743002: Register a pref to control migration status (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@change_scoping_type

Patch Set: address review comments Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/host_content_settings_map_unittest.cc ('K') | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | components/content_settings/core/browser/host_content_settings_map.cc » ('j') | components/content_settings/core/browser/host_content_settings_map.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..a3200095a54d4f7565e1b83165182507dfeabb07 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;

@@ -316,9 +317,12 @@ class HostContentSettingsMap : public content_settings::Observer,

// ContentSettingsTypes which are domain scoped. Only narrow down ALLOW

// domain settings to origins so that this will not cause privacy/security

// issues.

+ // |after_sync| is false means the migration is done upon construction of the

raymes 2016/07/25 03:56:38 nit: put this on the previous line or in a new par

raymes 2016/07/25 03:56:38 nit: |after_sync| will be false when called upon c

lshang 2016/07/25 04:51:10 Done.

+ // HostContentSettingsMap (before syncing any content settings), and is true

+ // means the migration is done after sync has finished.

// TODO(lshang): https://crbug.com/621398 Remove this when clients have

// migrated (~M56).

- void MigrateDomainScopedSettings();

+ void MigrateDomainScopedSettings(bool after_sync);

// Collect UMA data about the number of exceptions.

void RecordNumberOfExceptions();