Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: components/content_settings/core/browser/host_content_settings_map.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 1f29b5b4d1514f191a399e25a6615abb530ff817..cea05b39c92f38d3bc85a7d7fa58f1234e764f10 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -328,7 +328,7 @@ void HostContentSettingsMap::SetDefaultContentSetting(
// A value of CONTENT_SETTING_DEFAULT implies deleting the content setting.
if (setting != CONTENT_SETTING_DEFAULT) {
DCHECK(IsDefaultSettingAllowedForType(setting, content_type));
- value.reset(new base::FundamentalValue(setting));
+ value.reset(new base::Value(setting));
}
SetWebsiteSettingCustomScope(ContentSettingsPattern::Wildcard(),
ContentSettingsPattern::Wildcard(), content_type,
@@ -438,7 +438,7 @@ void HostContentSettingsMap::SetContentSettingCustomScope(
DCHECK(content_settings::ContentSettingsRegistry::GetInstance()
->Get(content_type)
->IsSettingValid(setting));
- value.reset(new base::FundamentalValue(setting));
+ value.reset(new base::Value(setting));
}
SetWebsiteSettingCustomScope(primary_pattern, secondary_pattern, content_type,
resource_identifier, std::move(value));
@@ -876,7 +876,7 @@ std::unique_ptr<base::Value> HostContentSettingsMap::GetWebsiteSetting(
info->secondary_pattern = ContentSettingsPattern::Wildcard();
}
return std::unique_ptr<base::Value>(
- new base::FundamentalValue(CONTENT_SETTING_ALLOW));
+ new base::Value(CONTENT_SETTING_ALLOW));
}
}
}

Powered by Google App Engine
This is Rietveld 408576698