| Index: chrome/browser/content_settings/content_settings_internal_extension_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
|
| index 1b818fe1eb3b12fb2647e16d988c32540293a860..d15d0b6f470e5e94a0aa46a60b8a44cd869bff4a 100644
|
| --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc
|
| @@ -10,6 +10,8 @@
|
| #include "chrome/browser/pdf/pdf_extension_util.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/chrome_content_client.h"
|
| +#include "components/content_settings/core/browser/content_settings_info.h"
|
| +#include "components/content_settings/core/browser/content_settings_registry.h"
|
| #include "components/content_settings/core/browser/content_settings_rule.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "components/content_settings/core/common/content_settings_pattern.h"
|
| @@ -209,6 +211,9 @@ void InternalExtensionProvider::SetContentSettingForExtensionAndResource(
|
| CONTENT_SETTINGS_TYPE_PLUGINS,
|
| resource);
|
| } else {
|
| + DCHECK(content_settings::ContentSettingsRegistry::GetInstance()
|
| + ->Get(CONTENT_SETTINGS_TYPE_PLUGINS)
|
| + ->IsSettingValid(setting));
|
| // Do not set a timestamp for extension settings.
|
| value_map_.SetValue(primary_pattern, secondary_pattern,
|
| CONTENT_SETTINGS_TYPE_PLUGINS, resource, base::Time(),
|
|
|