Add content_settings::PrefProvider to HostContentSettingsMap.

chrome/browser/content_settings/host_content_settings_map.h

Index: chrome/browser/content_settings/host_content_settings_map.h
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index 2cbbdddd871e477dfc85809b5067406bc663ff2f..c2658e8a7e5afdc9bfc4ddd5fa003385d3a1882a 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -27,6 +27,7 @@
 
 namespace content_settings {
 class DefaultProviderInterface;
+class ProviderInterface;
 }  // namespace content_settings
 
 class ContentSettingsDetails;
@@ -138,10 +139,6 @@ class HostContentSettingsMap
   // This should only be called on the UI thread.
   void ClearSettingsForOneType(ContentSettingsType content_type);
 
-  // Whether the |content_type| requires an additional resource identifier for
-  // accessing content settings.
-  bool RequiresResourceIdentifier(ContentSettingsType content_type) const;
-
   // This setting trumps any host-specific settings.
   bool BlockThirdPartyCookies() const { return block_third_party_cookies_; }
   bool IsBlockThirdPartyCookiesManaged() const {
@@ -176,29 +173,6 @@ class HostContentSettingsMap
  private:
   friend class base::RefCountedThreadSafe<HostContentSettingsMap>;
 
-  typedef std::pair<ContentSettingsType, std::string>
-      ContentSettingsTypeResourceIdentifierPair;
-  typedef std::map<ContentSettingsTypeResourceIdentifierPair, ContentSetting>
-      ResourceContentSettings;
-
-  struct ExtendedContentSettings;
-  typedef std::map<std::string, ExtendedContentSettings> HostContentSettings;
-
-  // Sets the fields of |settings| based on the values in |dictionary|.
-  void GetSettingsFromDictionary(const DictionaryValue* dictionary,
-                                 ContentSettings* settings);
-
-  // Populates |settings| based on the values in |dictionary|.
-  void GetResourceSettingsFromDictionary(const DictionaryValue* dictionary,
-                                         ResourceContentSettings* settings);
-
-  // Returns true if |settings| consists entirely of CONTENT_SETTING_DEFAULT.
-  bool AllDefault(const ExtendedContentSettings& settings) const;
-
-  // Reads the host exceptions from the prefereces service. If |overwrite| is
-  // true and the preference is missing, the local copy will be cleared as well.
-  void ReadExceptions(bool overwrite);
-
   // Informs observers that content settings have changed. Make sure that
   // |lock_| is not held when calling this, as listeners will usually call one
   // of the GetSettings functions in response, which would then lead to a
@@ -210,13 +184,6 @@ class HostContentSettingsMap
   // Various migration methods (old cookie, popup and per-host data gets
   // migrated to the new format).
   void MigrateObsoleteCookiePref(PrefService* prefs);
-  void MigrateObsoletePopupsPref(PrefService* prefs);
-  void MigrateObsoletePerhostPref(PrefService* prefs);
-
-  // Converts all exceptions that have non-canonicalized pattern into
-  // canonicalized pattern. If such pattern already exists, we just remove the
-  // old exception.
-  void CanonicalizeContentSettingsExceptions(DictionaryValue* settings);
 
   // The profile we're associated with.
   Profile* profile_;
@@ -231,21 +198,17 @@ class HostContentSettingsMap
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
-  // Content setting providers.
+  // Default content setting providers.
   std::vector<linked_ptr<content_settings::DefaultProviderInterface> >
       default_content_settings_providers_;
 
+  // Content setting providers.
+  std::vector<linked_ptr<content_settings::ProviderInterface> >
+      content_settings_providers_;
+
   // Used around accesses to the following objects to guarantee thread safety.
   mutable base::Lock lock_;
 
-  // Copies of the pref data, so that we can read it on threads other than the
-  // UI thread.
-  HostContentSettings host_content_settings_;
-
-  // Differences to the preference-stored host content settings for
-  // off-the-record settings.
-  HostContentSettings off_the_record_settings_;
-
   // Misc global settings.
   bool block_third_party_cookies_;
   bool is_block_third_party_cookies_managed_;