Implement preference and policy based content settings providers.

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 e19c125992fb4f0dceb438a1ea7037a8ed01e63a..973b6ff925803a36bb309f17cd833f2c0c7c1c3d 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/linked_ptr.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/browser_thread.h"
@@ -25,6 +26,7 @@
 #include "chrome/common/notification_registrar.h"
 
 class ContentSettingsDetails;
+class ContentSettingsProviderInterface;
 class DictionaryValue;
 class GURL;
 class PrefService;
@@ -187,30 +189,9 @@ class HostContentSettingsMap
   void GetResourceSettingsFromDictionary(const DictionaryValue* dictionary,
                                          ResourceContentSettings* settings);
 
-  // Forces the default settings to be explicitly set instead of themselves
-  // being CONTENT_SETTING_DEFAULT.
-  void ForceDefaultsToBeExplicit();
-
   // Returns true if |settings| consists entirely of CONTENT_SETTING_DEFAULT.
   bool AllDefault(const ExtendedContentSettings& settings) const;
 
-  // Reads the default settings from the prefereces service. If |overwrite| is
-  // true and the preference is missing, the local copy will be cleared as well.
-  void ReadDefaultSettings(bool overwrite);
-
-  // Reads managed default content settings from the preference service |prefs|.
-  // |settings| is set to the respective content setting for managed settings,
-  // and to CONTENT_SETTING_DEFAULT for other settings.
-  void ReadManagedDefaultSettings(const PrefService* prefs,
-                                  ContentSettings* settings);
-
-  // Updates the managed setting of the default-content-settings-type |type|.
-  // The updated setting is read from the preference service |prefs| and written
-  // to |settings|.
-  void UpdateManagedDefaultSetting(ContentSettingsType type,
-                                   const PrefService* prefs,
-                                   ContentSettings* settings);
-
   // 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);
@@ -240,9 +221,21 @@ class HostContentSettingsMap
   NotificationRegistrar notification_registrar_;
   PrefChangeRegistrar pref_change_registrar_;
 
+  // Whether this settings map is for an OTR session.
+  bool is_off_the_record_;
+
+  // Whether we are currently updating preferences, this is used to ignore
+  // notifications from the preferences service that we triggered ourself.
+  bool updating_preferences_;
+
+  // Content setting providers.
+  std::vector<linked_ptr<ContentSettingsProviderInterface> >
+      content_settings_providers_;
+
+  // Used around accesses to the following objects to guarantee thread safety.
+  mutable Lock lock_;
+
   // Copies of the pref data, so that we can read it on the IO thread.

[gfeher, 2010/12/09 10:29:53]

The comment at the beginning of this file says that instances of
HostContentSettingsMap can be read on any thread.

[jochen (gone - plz use gerrit), 2010/12/09 13:18:53]

Done.

-  ContentSettings default_content_settings_;
-  ContentSettings managed_default_content_settings_;
   HostContentSettings host_content_settings_;

[gfeher, 2010/12/09 10:29:53]

Is this (and the next one) the legacy system that will go away when you add
patter support to the HostContentSettingsProviders? (Just out of curiosity.)

[jochen (gone - plz use gerrit), 2010/12/09 13:18:53]

Yes, in the end the host content settings map should retrieve all these values
from providers

 
   // Differences to the preference-stored host content settings for
@@ -254,16 +247,6 @@ class HostContentSettingsMap
   bool is_block_third_party_cookies_managed_;
   bool block_nonsandboxed_plugins_;
 
-  // Used around accesses to the settings objects to guarantee thread safety.
-  mutable Lock lock_;
-
-  // Whether this settings map is for an OTR session.
-  bool is_off_the_record_;
-
-  // Whether we are currently updating preferences, this is used to ignore
-  // notifications from the preferences service that we triggered ourself.
-  bool updating_preferences_;
-
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };