Delegating the "are images allowed" decision to renderer.

chrome/browser/content_settings/host_content_settings_map.cc

 // 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.
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 
+#include <algorithm>
 #include <list>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/content_settings_extension_provider.h"
 #include "chrome/browser/content_settings/content_settings_observable_provider.h"
 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
@@ skipping 323 matching lines @@
           ContentSettingsType(j),
           "");
     }
   }
   return output;
 }
 
 void HostContentSettingsMap::GetSettingsForOneType(
     ContentSettingsType content_type,
     const std::string& resource_identifier,
-    SettingsForOneType* settings) const {
+    content_settings::ProviderInterface::Rule::SortFunction sort_function,
+    ContentSettingsForOneType* settings)

[Bernhard Bauer, 2011/09/16 09:16:48]

Nit: I think the |const| belongs on this line?

[marja, 2011/09/19 11:53:40]

Done.

+    const {
   DCHECK_NE(content_settings::RequiresResourceIdentifier(content_type),
             resource_identifier.empty());
   DCHECK(settings);
 
   settings->clear();
   for (size_t i = 0; i < content_settings_providers_.size(); ++i) {
     // Get rules from the content settings provider.
-    Rules rules;
+    Rules rules_for_provider;
     content_settings_providers_[i]->GetAllContentSettingsRules(
-        content_type, resource_identifier, &rules);
+        content_type, resource_identifier, &rules_for_provider);
 
-    // Sort rules according to their primary-secondary pattern string pairs
-    // using a map.
-    std::map<StringPair, PatternSettingSourceTuple> settings_map;
-    for (Rules::iterator rule = rules.begin();
-         rule != rules.end();
-         ++rule) {
-      StringPair sort_key(rule->primary_pattern.ToString(),
-                          rule->secondary_pattern.ToString());
-      settings_map[sort_key] = PatternSettingSourceTuple(
-          rule->primary_pattern,
-          rule->secondary_pattern,
-          rule->content_setting,
-          kProviderNames[i]);
+    // The rules are returned in arbitrary order. Sort them according to the
+    // ContentSettingsPattern precedence relation.
+    if (sort_function) {
+      std::sort(rules_for_provider.begin(), rules_for_provider.end(),
+                sort_function);
     }
 
     // TODO(markusheintz): Only the rules that are applied should be added.
-    for (std::map<StringPair, PatternSettingSourceTuple>::iterator i(
-             settings_map.begin());
-         i != settings_map.end();
-         ++i) {
-      settings->push_back(i->second);
+    for (Rules::const_iterator it = rules_for_provider.begin();
+         it != rules_for_provider.end(); ++it) {
+      settings->push_back(ContentSettingPatternSourceTuple(
+          it->primary_pattern, it->secondary_pattern,
+          it->content_setting, kProviderNames[i]));
     }
   }
 }
 
 void HostContentSettingsMap::SetDefaultContentSetting(
     ContentSettingsType content_type,
     ContentSetting setting) {
   DCHECK_NE(content_type, CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE);
   DCHECK(IsSettingAllowedForType(setting, content_type));
   for (DefaultProviderIterator provider =
@@ skipping 198 matching lines @@
         SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
             (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ?
                 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
     }
     if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) {
       SetBlockThirdPartyCookies(cookie_behavior ==
           net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
     }
   }
 }