Revert 98938 - Migrate Obsolete NotificationsSettings and remove content_settings::NotificationsP...

chrome/browser/content_settings/content_settings_pref_provider.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
 #pragma once
 
 // A content settings provider that takes its settings out of the pref service.
 
@@ skipping 130 matching lines @@
 
   // Update the preference that stores content settings exceptions and syncs the
   // value to the obsolete preference.
   void UpdatePref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       ContentSetting setting);
 
-  // Updates the given |pattern_pairs_settings| dictionary value.
-  void UpdatePatternPairsSettings(
+  // Update the preference prefs::kContentSettingsPatternPairs, which is used to
+  // persist content settings exceptions and supposed to replace the preferences
+  // prefs::kContentSettingsPatterns and prefs::kGeolocationContentSettings.
+  void UpdatePatternPairsPref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
-      ContentSetting setting,
-      DictionaryValue* pattern_pairs_settings);
+      ContentSetting setting);
 
   // Updates the preferences prefs::kContentSettingsPatterns. This preferences
   // is obsolete and only used for compatibility reasons.
   void UpdateObsoletePatternsPref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       ContentSetting setting);
 
-  // Updates the preference prefs::kGeolocationContentSettings. This preference
+  // Updates the preferences prefs::kGeolocationContentSettings. This preference
   // is obsolete and only used to keep sync working with older chrome versions
   // that do not know about the new preference.
   void UpdateObsoleteGeolocationPref(
       const ContentSettingsPattern& primary_pattern,
       const ContentSettingsPattern& secondary_pattern,
       ContentSetting setting);
 
-  // Updates the obsolete notifications settings in the passed list values
-  // |allowed_sites| and |denied_sites|.
-  void UpdateObsoleteNotificationsSettings(
-      const ContentSettingsPattern& primary_pattern,
-      const ContentSettingsPattern& secondary_pattern,
-      ContentSetting setting,
-      ListValue* allowed_sites,
-      ListValue* denied_sites);
-
   // Various migration methods (old cookie, popup and per-host data gets
   // migrated to the new format).
   void MigrateObsoletePerhostPref();
   void MigrateObsoletePopupsPref();
   void MigrateObsoleteContentSettingsPatternPref();
   void MigrateObsoleteGeolocationPref();
-  void MigrateObsoleteNotificationsPrefs();
 
   // Copies the value of the preference that stores the content settings
   // exceptions to the obsolete preference for content settings exceptions. This
   // is necessary to allow content settings exceptions beeing synced to older
   // versions of chrome that only use the obsolete preference.
   void SyncObsoletePatternPref();
 
-  // Copies the notifications and geolocation content settings exceptions from
-  // the preference that stores the content settings exceptions to the obsolete
-  // preference for notification and geolocation content settings exceptions.
-  // This is necessary to allow notifications and geolocation content settings
-  // exceptions being synced to older versions of chrome that only use the
-  // obsolete preference.
-  void SyncObsoletePrefs();
+  // Copies the geolocation content settings exceptions from the preference that
+  // stores the content settings exceptions to the obsolete preference for
+  // geolocation content settings exceptions. This is necessary to allow
+  // geolocation content settings exceptions being synced to older versions of
+  // chrome that only use the obsolete preference.
+  void SyncObsoleteGeolocationPref();
 
   static void CanonicalizeContentSettingsExceptions(
       base::DictionaryValue* all_settings_dictionary);
 
   // Weak; owned by the Profile and reset in ShutdownOnUIThread.
   PrefService* prefs_;
 
   bool is_incognito_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   OriginIdentifierValueMap value_map_;
 
   OriginIdentifierValueMap incognito_value_map_;
 
   // Used around accesses to the value map objects to guarantee
   // thread safety.
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProvider);
 };
 
 }  // namespace content_settings
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_