1 files changed, 10 insertions, 13 deletions
diff --git a/chromium/components/content_settings/core/browser/content_settings_utils.cc b/chromium/components/content_settings/core/browser/content_settings_utils.cc
index 75473709e0e..6a37f727642 100644
--- a/chromium/components/content_settings/core/browser/content_settings_utils.cc
+++ b/chromium/components/content_settings/core/browser/content_settings_utils.cc
@@ -70,9 +70,9 @@ std::string ContentSettingToString(ContentSetting setting) {
 
 bool ContentSettingFromString(const std::string& name,
                               ContentSetting* setting) {
-  for (size_t i = 0; i < base::size(kContentSettingsStringMapping); ++i) {
-    if (name == kContentSettingsStringMapping[i].content_setting_str) {
-      *setting = kContentSettingsStringMapping[i].content_setting;
+  for (const auto& string_mapping : kContentSettingsStringMapping) {
+    if (name == string_mapping.content_setting_str) {
+      *setting = string_mapping.content_setting;
       return true;
     }
   }
@@ -120,7 +120,7 @@ PatternPair ParsePatternString(const std::string& pattern_str) {
 
 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                                     RendererContentSettingRules* rules) {
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(IS_ANDROID)
   map->GetSettingsForOneType(ContentSettingsType::IMAGES,
                              &(rules->image_rules));
   map->GetSettingsForOneType(ContentSettingsType::MIXEDSCRIPT,
@@ -129,24 +129,21 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
   // is added for all origins.
   rules->auto_dark_content_rules.push_back(ContentSettingPatternSource(
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
-      base::Value::FromUniquePtrValue(
-          ContentSettingToValue(CONTENT_SETTING_ALLOW)),
-      std::string(), map->IsOffTheRecord()));
+      ContentSettingToValue(CONTENT_SETTING_ALLOW), std::string(),
+      map->IsOffTheRecord()));
 #else
   // Android doesn't use image content settings, so ALLOW rule is added for
   // all origins.
   rules->image_rules.push_back(ContentSettingPatternSource(
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
-      base::Value::FromUniquePtrValue(
-          ContentSettingToValue(CONTENT_SETTING_ALLOW)),
-      std::string(), map->IsOffTheRecord()));
+      ContentSettingToValue(CONTENT_SETTING_ALLOW), std::string(),
+      map->IsOffTheRecord()));
   // In Android active mixed content is hard blocked, with no option to allow
   // it.
   rules->mixed_content_rules.push_back(ContentSettingPatternSource(
       ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
-      base::Value::FromUniquePtrValue(
-          ContentSettingToValue(CONTENT_SETTING_BLOCK)),
-      std::string(), map->IsOffTheRecord()));
+      ContentSettingToValue(CONTENT_SETTING_BLOCK), std::string(),
+      map->IsOffTheRecord()));
   map->GetSettingsForOneType(ContentSettingsType::AUTO_DARK_WEB_CONTENT,
                              &(rules->auto_dark_content_rules));
 #endif