Register a pref to control migration status

components/content_settings/core/browser/host_content_settings_map.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Maps hostnames to custom content settings.  Written on the UI thread and read
 // on any thread.  One instance per profile.
 
 #ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_
 
@@ skipping 262 matching lines @@
   void RemoveObserver(content_settings::Observer* observer);
 
   // Schedules any pending lossy website settings to be written to disk.
   void FlushLossyWebsiteSettings();
 
   // Passes ownership of |clock|.
   void SetPrefClockForTesting(std::unique_ptr<base::Clock> clock);
 
  private:
   friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
+  friend class HostContentSettingsMapTest_DomainToOriginMigrationStatus_Test;
   friend class HostContentSettingsMapTest_MigrateDomainScopedSettings_Test;
   friend class HostContentSettingsMapTest_MigrateKeygenSettings_Test;
 
   friend class content_settings::TestUtils;
 
   typedef std::map<ProviderType, content_settings::ProviderInterface*>
       ProviderMap;
   typedef ProviderMap::iterator ProviderIterator;
   typedef ProviderMap::const_iterator ConstProviderIterator;
 
@@ skipping 16 matching lines @@
   // settings to use ContentSettingsPattern::Wildcard(). This allows us to make
   // the scoping code consistent across different settings.
   // TODO(lshang): Remove this when clients have migrated (~M53). We should
   // 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.
+  // |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 paragraph (with an extra blank
comment line above)

[raymes, 2016/07/25 03:56:38]

nit: |after_sync| will be false when called upon construction of this object and
true when called by the sync layer after sync is completed.

[lshang, 2016/07/25 04:51:10]

Done.

[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();
 
   // Adds content settings for |content_type| and |resource_identifier|,
   // provided by |provider|, into |settings|. If |incognito| is true, adds only
   // the content settings which are applicable to the incognito mode and differ
   // from the normal mode. Otherwise, adds the content settings for the normal
   // mode.
   void AddSettingsForOneType(
@@ skipping 61 matching lines @@
   content_settings::PrefProvider* pref_provider_ = nullptr;
 
   base::ThreadChecker thread_checker_;
 
   base::ObserverList<content_settings::Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_