| Index: components/content_settings/core/browser/content_settings_registry.cc
|
| diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
|
| index c104f672a582c8a27680ef666e6657c9c9972af8..cdcccc5f5ae7058bb6b1572431bfd3dd538473b2 100644
|
| --- a/components/content_settings/core/browser/content_settings_registry.cc
|
| +++ b/components/content_settings/core/browser/content_settings_registry.cc
|
| @@ -339,9 +339,9 @@ void ContentSettingsRegistry::Register(
|
| ContentSettingsInfo::IncognitoBehavior incognito_behavior) {
|
| // Ensure that nothing has been registered yet for the given type.
|
| DCHECK(!website_settings_registry_->Get(type));
|
| - DCHECK(incognito_behavior
|
| - != ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW
|
| - || ContainsKey(valid_settings, CONTENT_SETTING_ASK))
|
| + DCHECK(incognito_behavior !=
|
| + ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW ||
|
| + base::ContainsKey(valid_settings, CONTENT_SETTING_ASK))
|
| << "If INHERIT_IN_INCOGNITO_EXCEPT_ALLOW is set, ASK must be listed as a "
|
| "valid setting.";
|
| std::unique_ptr<base::Value> default_value(
|
| @@ -357,7 +357,7 @@ void ContentSettingsRegistry::Register(
|
| if (!website_settings_info)
|
| return;
|
|
|
| - DCHECK(!ContainsKey(content_settings_info_, type));
|
| + DCHECK(!base::ContainsKey(content_settings_info_, type));
|
| content_settings_info_[type] = base::WrapUnique(
|
| new ContentSettingsInfo(website_settings_info, whitelisted_schemes,
|
| valid_settings, incognito_behavior));
|
|
|