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 <utility>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 316 matching lines @@
           ContentSettingsType(j),
           std::string());
     }
   }
   return output;
 }
 
 void HostContentSettingsMap::GetSettingsForOneType(
     ContentSettingsType content_type,
     const std::string& resource_identifier,
-    SettingsForOneType* settings) const {
+    ContentSettingsForOneType* settings) const {
   DCHECK(content_settings::SupportsResourceIdentifier(content_type) ||
          resource_identifier.empty());
   DCHECK(settings);
 
   settings->clear();
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
     // For each provider, iterate first the incognito-specific rules, then the
     // normal rules.
@@ skipping 221 matching lines @@
           net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
     }
   }
 }
 
 void HostContentSettingsMap::AddSettingsForOneType(
     const content_settings::ProviderInterface* provider,
     ProviderType provider_type,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
-    SettingsForOneType* settings,
+    ContentSettingsForOneType* settings,
     bool incognito) const {
   scoped_ptr<content_settings::RuleIterator> rule_iterator(
       provider->GetRuleIterator(content_type,
                                 resource_identifier,
                                 incognito));
   ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
   while (rule_iterator->HasNext()) {
     const content_settings::Rule& rule = rule_iterator->Next();
     // Filter out default settings.
     if (rule.primary_pattern == wildcard &&
         rule.secondary_pattern == wildcard &&
         (provider_type == POLICY_PROVIDER ||
          provider_type == DEFAULT_PROVIDER)) {
         continue;
     }
-    settings->push_back(PatternSettingSourceTuple(
+    settings->push_back(ContentSettingPatternSource(
         rule.primary_pattern, rule.secondary_pattern,
         content_settings::ValueToContentSetting(rule.value.get()),
         kProviderNames[provider_type],
         incognito));
   }
 }