commit 45e261821a2e4697e897e00acb06fa731cf152eb
author hscham <hscham@chromium.org> Mon Oct 12 13:50:06 2020 +0900
committer Commit Bot <commit-bot@chromium.org> Mon Oct 19 12:01:12 2020 +0000
tree a36fff0af86f5752a3273b0800b0a1ed1e9ab042
parent 3f99ff1b6c4e11ad6d7cac319f36fd6a58dfb1e6

policy_utils: base::Value refractor

Replace usages of to-be-deprecated base::DictionaryValue by new
base::Value API.

BUG=chromium:1099111
TEST=cros_run_unit_tests --board=eve --packages policy_utils

Change-Id: I4d9e7b29d8c156e96f58684c205d3a3c66a1ec2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2465544
Tested-by: Grace Cham <hscham@chromium.org>
Reviewed-by: Georges Winkenbach <gwink@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Grace Cham <hscham@chromium.org>

policy_utils/policy_writer.cc

diff --git a/policy_utils/policy_writer.cc b/policy_utils/policy_writer.cc
index 5f5639d..f081e9d 100644
--- a/policy_utils/policy_writer.cc
+++ b/policy_utils/policy_writer.cc
@@ -49,7 +49,7 @@
 
 // Converts the given policy to a JSON string and writes it to file
 // <dir_path>/<file_name>. Returns whether successul.
-bool WritePolicyToFile(const base::DictionaryValue& policy,
+bool WritePolicyToFile(const base::Value& policy,
                        const base::FilePath& dir_path,
                        const char* file_name) {
   if (!file_name) {
@@ -86,22 +86,22 @@
 PolicyWriter::~PolicyWriter() {}
 
 bool PolicyWriter::SetDeviceAllowBluetooth(bool is_allowed) const {
-  base::DictionaryValue policy;
-  policy.SetBoolean(kPolicyDeviceAllowBluetooth, is_allowed);
+  base::Value policy(base::Value::Type::DICTIONARY);
+  policy.SetBoolKey(kPolicyDeviceAllowBluetooth, is_allowed);
   return WritePolicyToFile(policy, dest_dir_path_,
                            kPolicyDeviceAllowBluetoothFileName);
 }
 
 bool PolicyWriter::SetShowHomeButton(bool show) const {
-  base::DictionaryValue policy;
-  policy.SetBoolean(kPolicyShowHomeButton, show);
+  base::Value policy(base::Value::Type::DICTIONARY);
+  policy.SetBoolKey(kPolicyShowHomeButton, show);
   return WritePolicyToFile(policy, dest_dir_path_,
                            kPolicyShowHomeButtonFileName);
 }
 
 bool PolicyWriter::SetBookmarkBarEnabled(bool is_enabled) const {
-  base::DictionaryValue policy;
-  policy.SetBoolean(kPolicyBookmarkBarEnabled, is_enabled);
+  base::Value policy(base::Value::Type::DICTIONARY);
+  policy.SetBoolKey(kPolicyBookmarkBarEnabled, is_enabled);
   return WritePolicyToFile(policy, dest_dir_path_,
                            kPolicyBookmarkBarEnabledFileName);
 }