[CodeHealth] Remove DictionaryValue in components/permissions

This converts usage of base::DictionaryValue to base::Value in
components/permissions. Most of the conversion was going from
unique_ptr<base::DictionaryValue> to unique_ptr<base::Value>. While we
are moving away from heap-allocated base::Values, these particular
values are std::moved to other APIs expecting unique_ptr<base::Value>.

Usage of base::ListValue was also converted to base::Value.

Bug: 1187061, 1187062
Change-Id: I37e748030e022ca4d0897480e7444181c2c3be27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3137317
Reviewed-by: Ravjit Singh Uppal <[email protected]>
Reviewed-by: Balazs Engedy <[email protected]>
Commit-Queue: Scott Haseley <[email protected]>
Cr-Commit-Position: refs/heads/main@{#918860}

Author: shaseley

components/permissions/object_permission_context_base.cc

@@ -265,11 +265,11 @@ void ObjectPermissionContextBase::SaveWebsiteSetting(
     return;
   }
 
-  base::ListValue objects_list;
+  base::Value objects_list(base::Value::Type::LIST);
   for (const auto& object : origin_objects_it->second) {
     objects_list.Append(object.second->value.Clone());
   }
-  base::DictionaryValue website_setting_value;
+  base::Value website_setting_value(base::Value::Type::DICTIONARY);
   website_setting_value.SetKey(kObjectListKey, std::move(objects_list));
   host_content_settings_map_->SetWebsiteSettingDefaultScope(
       origin.GetURL(), GURL(), data_content_settings_type_,

components/permissions/permission_decision_auto_blocker.cc

@@ -53,17 +53,16 @@ int g_dismissal_embargo_days = kDefaultEmbargoDays;
 // permission due to repeated ignores.
 int g_ignore_embargo_days = kDefaultEmbargoDays;
 
-std::unique_ptr<base::DictionaryValue> GetOriginAutoBlockerData(
+std::unique_ptr<base::Value> GetOriginAutoBlockerData(
     HostContentSettingsMap* settings,
     const GURL& origin_url) {
-  std::unique_ptr<base::DictionaryValue> dict =
-      base::DictionaryValue::From(settings->GetWebsiteSetting(
-          origin_url, GURL(), ContentSettingsType::PERMISSION_AUTOBLOCKER_DATA,
-          nullptr));
-  if (!dict)
-    return std::make_unique<base::DictionaryValue>();
-
-  return dict;
+  std::unique_ptr<base::Value> website_setting = settings->GetWebsiteSetting(
+      origin_url, GURL(), ContentSettingsType::PERMISSION_AUTOBLOCKER_DATA,
+      nullptr);
+  if (!website_setting || !website_setting->is_dict())
+    return std::make_unique<base::Value>(base::Value::Type::DICTIONARY);
+
+  return website_setting;
 }
 
 base::Value* GetOrCreatePermissionDict(base::Value* origin_dict,
@@ -80,7 +79,7 @@ int RecordActionInWebsiteSettings(const GURL& url,
                                   ContentSettingsType permission,
                                   const char* key,
                                   HostContentSettingsMap* settings_map) {
-  std::unique_ptr<base::DictionaryValue> dict =
+  std::unique_ptr<base::Value> dict =
       GetOriginAutoBlockerData(settings_map, url);
 
   base::Value* permission_dict = GetOrCreatePermissionDict(
@@ -102,7 +101,7 @@ int GetActionCount(const GURL& url,
                    ContentSettingsType permission,
                    const char* key,
                    HostContentSettingsMap* settings_map) {
-  std::unique_ptr<base::DictionaryValue> dict =
+  std::unique_ptr<base::Value> dict =
       GetOriginAutoBlockerData(settings_map, url);
   base::Value* permission_dict = GetOrCreatePermissionDict(
       dict.get(), PermissionUtil::GetPermissionString(permission));
@@ -185,7 +184,7 @@ PermissionResult PermissionDecisionAutoBlocker::GetEmbargoResult(
   DCHECK(settings_map);
   DCHECK(PermissionUtil::IsPermission(permission));
 
-  std::unique_ptr<base::DictionaryValue> dict =
+  std::unique_ptr<base::Value> dict =
       GetOriginAutoBlockerData(settings_map, request_origin);
   base::Value* permission_dict = GetOrCreatePermissionDict(
       dict.get(), PermissionUtil::GetPermissionString(permission));
@@ -261,7 +260,7 @@ base::Time PermissionDecisionAutoBlocker::GetEmbargoStartTime(
     const GURL& request_origin,
     ContentSettingsType permission) {
   DCHECK(settings_map_);
-  std::unique_ptr<base::DictionaryValue> dict =
+  std::unique_ptr<base::Value> dict =
       GetOriginAutoBlockerData(settings_map_, request_origin);
   base::Value* permission_dict = GetOrCreatePermissionDict(
       dict.get(), PermissionUtil::GetPermissionString(permission));
@@ -397,7 +396,7 @@ void PermissionDecisionAutoBlocker::RemoveEmbargoAndResetCounts(
   if (!PermissionUtil::IsPermission(permission))
     return;
 
-  std::unique_ptr<base::DictionaryValue> dict =
+  std::unique_ptr<base::Value> dict =
       GetOriginAutoBlockerData(settings_map_, url);
 
   dict->RemoveKey(PermissionUtil::GetPermissionString(permission));
@@ -441,7 +440,7 @@ void PermissionDecisionAutoBlocker::PlaceUnderEmbargo(
     const GURL& request_origin,
     ContentSettingsType permission,
     const char* key) {
-  std::unique_ptr<base::DictionaryValue> dict =
+  std::unique_ptr<base::Value> dict =
       GetOriginAutoBlockerData(settings_map_, request_origin);
   base::Value* permission_dict = GetOrCreatePermissionDict(
       dict.get(), PermissionUtil::GetPermissionString(permission));

components/permissions/prediction_service/prediction_service_common.cc

@@ -40,7 +40,7 @@ constexpr char kDiscretizedLikelihood[] = "discretizedLikelihood";
 
 std::string GeneratePredictionsRequestMessageToJson(
     const GeneratePredictionsRequest& message) {
-  base::DictionaryValue dict_message;
+  base::Value dict_message(base::Value::Type::DICTIONARY);
 
   base::Value client_features(base::Value::Type::DICTIONARY);
   client_features.SetKey(kPlatform, base::Value(ClientFeatures_Platform_Name(