Move pref names and default value into WebsiteSettingsInfo

components/content_settings/core/browser/content_settings_pref.h

Index: components/content_settings/core/browser/content_settings_pref.h
diff --git a/components/content_settings/core/browser/content_settings_pref.h b/components/content_settings/core/browser/content_settings_pref.h
index 1314e163c889f65bf7ff275af9fb7d07b26807a3..ccdfcf85ef858524cc2b22094b809b3f3a75f8cd 100644
--- a/components/content_settings/core/browser/content_settings_pref.h
+++ b/components/content_settings/core/browser/content_settings_pref.h
@@ -43,9 +43,8 @@ class ContentSettingsPref {
   ContentSettingsPref(ContentSettingsType content_type,
                       PrefService* prefs,
                       PrefChangeRegistrar* registrar,
-                      const char* pref_name,
+                      const std::string& pref_name,
                       bool incognito,
-                      bool* updating_old_preferences_flag,
                       NotifyObserversCallback notify_callback);
   ~ContentSettingsPref();
 
@@ -69,14 +68,12 @@ class ContentSettingsPref {
   size_t GetNumExceptions();
 
  private:
-  // Only to access static method CanonicalizeContentSettingsExceptions,
-  // so that we reduce duplicity between the two.
-  // TODO(msramek): Remove this after the migration is over.
-  friend class PrefProvider;
+  friend class DeadlockCheckerObserver;  // For testing.
+  friend class DeadlockCheckerThread;    // For testing.
 
-  // Reads all content settings exceptions from the preference and load them
+  // Reads all content settings exceptions from the preference and loads them
   // into the |value_map_|. The |value_map_| is cleared first.
-  void ReadContentSettingsFromPrefAndWriteToOldPref();
+  void ReadContentSettingsFromPref();
 
   // Callback for changes in the pref with the same name.
   void OnPrefChanged();
@@ -99,20 +96,6 @@ class ContentSettingsPref {
   // release it.
   void AssertLockNotHeld() const;
 
-  // Update the old aggregate preference, so that the settings can be synced
-  // to old versions of Chrome.
-  // TODO(msramek): Remove after the migration is over.
-  void UpdateOldPref(
-      const ContentSettingsPattern& primary_pattern,
-      const ContentSettingsPattern& secondary_pattern,
-      const ResourceIdentifier& resource_identifier,
-      const base::Value* value);
-
-  // Remove all exceptions of |content_type_| from the old aggregate dictionary
-  // preference.
-  // TODO(msramek): Remove after the migration is over.
-  void ClearOldPreference();
-
   // The type of content settings stored in this pref.
   ContentSettingsType content_type_;
 
@@ -123,7 +106,7 @@ class ContentSettingsPref {
   PrefChangeRegistrar* registrar_;
 
   // Name of the dictionary preference managed by this class.
-  const char* pref_name_;
+  const std::string& pref_name_;
 
   bool is_incognito_;
 
@@ -131,11 +114,6 @@ class ContentSettingsPref {
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
-  // Whether we are currently updating the old aggregate dictionary preference.
-  // Owned by the parent |PrefProvider| and shared by all its children
-  // |ContentSettingsPref|s.
-  bool* updating_old_preferences_;
-
   OriginIdentifierValueMap value_map_;
 
   OriginIdentifierValueMap incognito_value_map_;