| 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 93eea27834da5ba77565970a962f68085442d607..fca1ec0b6ceebf3a63b8035e3376152b73a3d7fc 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc
|
| @@ -334,7 +334,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);
|
| @@ -576,7 +576,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,
|
| @@ -592,7 +592,7 @@ void HostContentSettingsMap::AddSettingsForOneType(
|
| 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],
|
|
|