Delegating the "are images allowed" decision to renderer.

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 3a9724b6e47f6af6bf2acb7875b0d80834bc11e8..34f54a0b9a81a9278061dc3b0ab124febff6b873 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -20,6 +20,7 @@
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_observer.h"
+#include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
@@ -43,14 +44,6 @@ class HostContentSettingsMap
       public NotificationObserver,
       public base::RefCountedThreadSafe<HostContentSettingsMap> {
  public:
-  // TODO(markusheintz): I sold my soul to the devil on order to add this tuple.
-  // I really want my soul back, so I really will change this ASAP.
-  typedef Tuple4<ContentSettingsPattern,
-                 ContentSettingsPattern,
-                 ContentSetting,
-                 std::string> PatternSettingSourceTuple;
-  typedef std::vector<PatternSettingSourceTuple> SettingsForOneType;
-
   HostContentSettingsMap(PrefService* prefs,
                          ExtensionService* extension_service,
                          bool incognito);
@@ -113,16 +106,19 @@ class HostContentSettingsMap
       const GURL& secondary_url) const;
 
   // For a given content type, returns all patterns with a non-default setting,
-  // mapped to their actual settings, in lexicographical order.  |settings|
-  // must be a non-NULL outparam. If this map was created for the
-  // incognito profile, it will only return those settings differing from
-  // the main map. For ContentSettingsTypes that require an resource identifier
-  // to be specified, the |resource_identifier| must be non-empty.
+  // mapped to their actual settings. Settings of each provider are sorted
+  // according to |sort_function|. |settings| must be a non-NULL outparam. If
+  // this map was created for the incognito profile, it will only return those
+  // settings differing from the main map. For ContentSettingsTypes that require
+  // an resource identifier to be specified, the |resource_identifier| must be
+  // non-empty.
   //
   // This may be called on any thread.
-  void GetSettingsForOneType(ContentSettingsType content_type,
-                             const std::string& resource_identifier,
-                             SettingsForOneType* settings) const;
+  void GetSettingsForOneType(
+      ContentSettingsType content_type,
+      const std::string& resource_identifier,
+      content_settings::ProviderInterface::Rule::SortFunction sort_function,
+      ContentSettingsForOneType* settings) const;
 
   // Sets the default setting for a particular content type. This method must
   // not be invoked on an incognito map.