| Index: chrome/browser/content_settings/host_content_settings_map.cc
|
| diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
|
| index 5d76b9234afc5b96080add137f629207b33df1c1..c345ae2349e80042cd5f821f7203f6965fd05439 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc
|
| @@ -316,7 +316,7 @@ ContentSettings HostContentSettingsMap::GetContentSettings(
|
| 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);
|
| @@ -552,7 +552,7 @@ void HostContentSettingsMap::AddSettingsForOneType(
|
| 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,
|
| @@ -561,7 +561,7 @@ void HostContentSettingsMap::AddSettingsForOneType(
|
| ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
|
| while (rule_iterator->HasNext()) {
|
| const content_settings::Rule& rule = rule_iterator->Next();
|
| - settings->push_back(PatternSettingSourceTuple(
|
| + settings->push_back(ContentSettingPatternSource(
|
| rule.primary_pattern, rule.secondary_pattern,
|
| content_settings::ValueToContentSetting(rule.value.get()),
|
| kProviderNames[provider_type],
|
|
|