| Index: components/content_settings/core/browser/host_content_settings_map.cc
|
| diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
|
| index b229a8b1ae9cac9409c049104c53cf474319698e..715df598158d02ccfdd0826bbb386713f7f9d6dc 100644
|
| --- a/components/content_settings/core/browser/host_content_settings_map.cc
|
| +++ b/components/content_settings/core/browser/host_content_settings_map.cc
|
| @@ -500,11 +500,9 @@ bool HostContentSettingsMap::IsSettingAllowedForType(
|
| return false;
|
| }
|
|
|
| -#if defined(OS_ANDROID)
|
| // App banners store a dictionary.
|
| if (content_type == CONTENT_SETTINGS_TYPE_APP_BANNER)
|
| return false;
|
| -#endif
|
|
|
| // DEFAULT, ALLOW and BLOCK are always allowed.
|
| if (setting == CONTENT_SETTING_DEFAULT ||
|
| @@ -542,10 +540,8 @@ bool HostContentSettingsMap::ContentTypeHasCompoundValue(
|
| // CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS are of type dictionary/map.
|
| // Compound types like dictionaries can't be mapped to the type
|
| // |ContentSetting|.
|
| -#if defined(OS_ANDROID)
|
| if (type == CONTENT_SETTINGS_TYPE_APP_BANNER)
|
| return true;
|
| -#endif
|
|
|
| return (type == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE ||
|
| type == CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
|
|
|