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

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

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 months 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 4f263c025e8bfad4293d589bd691855322ade68b..62d177bb83d0511d5d566fd9b5239a5228177aaa 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -348,7 +348,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,
@@ -471,7 +471,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));
@@ -801,7 +801,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