Register a pref to control migration status

components/content_settings/core/browser/host_content_settings_map.h

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..1edbce2410638bbc49f41baf422d9388f6a7a8f5 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;

[msramek, 2016/07/26 19:21:02]

nit: Can we change this and the below to FRIEND_TEST_ALL_PREFIXES ? It's a bit
more readable and it makes it easier to disable the tests if ever needed.

[lshang, 2016/07/27 00:23:47]

Done.

   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| will be false when called upon construction of this object and
+  // true when called by the sync layer after sync is completed.
   // 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();