Migrate PolicyMap::Set to use base::Value

Bug: 2270317
Change-Id: I756802a8ac8d8a526f4cf6a5f4c5f15c6fe8ddfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2282925Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Aya Elsayed <ayaelattar@google.com>
Auto-Submit: Aya Elsayed <ayaelattar@google.com>
Cr-Commit-Position: refs/heads/master@{#785979}

components/policy/core/common/policy_bundle_unittest.cc

@@ -32,13 +32,11 @@ const char kExtension3[] = "extension-3";
 // Adds test policies to |policy|.
 void AddTestPolicies(PolicyMap* policy) {
   policy->Set("mandatory-user", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-              POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), nullptr);
+              POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
   policy->Set("mandatory-machine", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-              POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("omg"),
-              nullptr);
+              POLICY_SOURCE_CLOUD, base::Value("omg"), nullptr);
   policy->Set("recommended-user", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-              POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(true),
-              nullptr);
+              POLICY_SOURCE_CLOUD, base::Value(true), nullptr);
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetBoolean("false", false);
   dict->SetInteger("int", 456);
@@ -58,13 +56,11 @@ void AddTestPoliciesWithParams(PolicyMap *policy,
                                PolicyLevel level,
                                PolicyScope scope) {
   policy->Set(kPolicyClashing0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-              POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(value),
-              nullptr);
+              POLICY_SOURCE_CLOUD, base::Value(value), nullptr);
   policy->Set(kPolicyClashing1, level, scope, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(value), nullptr);
+              base::Value(value), nullptr);
   policy->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-              POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(value),
-              nullptr);
+              POLICY_SOURCE_CLOUD, base::Value(value), nullptr);
 }
 
 // Returns true if |bundle| is empty.
@@ -192,7 +188,7 @@ TEST(PolicyBundleTest, MergeFrom) {
   // - kPolicyN are merged from each bundle.
   PolicyMap expected;
   expected.Set(kPolicyClashing0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(0), nullptr);
+               POLICY_SOURCE_CLOUD, base::Value(0), nullptr);
   expected.GetMutable(kPolicyClashing0)
       ->AddConflictingPolicy(policy1.Get(kPolicyClashing0)->DeepCopy());
   expected.GetMutable(kPolicyClashing0)
@@ -202,7 +198,7 @@ TEST(PolicyBundleTest, MergeFrom) {
   expected.GetMutable(kPolicyClashing0)
       ->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
   expected.Set(kPolicyClashing1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-               POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr);
+               POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
   expected.GetMutable(kPolicyClashing1)
       ->AddConflictingPolicy(policy0.Get(kPolicyClashing1)->DeepCopy());
   expected.GetMutable(kPolicyClashing1)
@@ -212,11 +208,11 @@ TEST(PolicyBundleTest, MergeFrom) {
   expected.GetMutable(kPolicyClashing1)
       ->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
   expected.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(0), nullptr);
+               POLICY_SOURCE_CLOUD, base::Value(0), nullptr);
   expected.Set(kPolicy1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr);
+               POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
   expected.Set(kPolicy2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(2), nullptr);
+               POLICY_SOURCE_CLOUD, base::Value(2), nullptr);
   EXPECT_TRUE(merged.Get(PolicyNamespace(POLICY_DOMAIN_CHROME,
                                          std::string())).Equals(expected));
   EXPECT_TRUE(merged.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS,
@@ -256,13 +252,13 @@ TEST(PolicyBundleTest, Equals) {
   other.CopyFrom(bundle);
   bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), nullptr);
+           POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
   EXPECT_FALSE(bundle.Equals(other));
   other.CopyFrom(bundle);
   EXPECT_TRUE(bundle.Equals(other));
   bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), nullptr);
+           POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
   EXPECT_FALSE(bundle.Equals(other));
 
   // Test non-const Get().
@@ -272,8 +268,7 @@ TEST(PolicyBundleTest, Equals) {
       bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
   EXPECT_TRUE(bundle.Equals(other));
   policy_map.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123),
-                 nullptr);
+                 POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
   EXPECT_FALSE(bundle.Equals(other));
 }
 

components/policy/core/common/policy_map_unittest.cc

@@ -95,7 +95,7 @@ TEST_F(PolicyMapTest, SetAndGet) {
       ExternalDataFetcher::Equals(entry->external_data_fetcher.get(),
                                   CreateExternalDataFetcher("dummy").get()));
   map.Set(kTestPolicyName1, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
-          POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr, nullptr);
+          POLICY_SOURCE_ENTERPRISE_DEFAULT, base::nullopt, nullptr);
   EXPECT_FALSE(map.GetValue(kTestPolicyName1));
   entry = map.Get(kTestPolicyName1);
   ASSERT_TRUE(entry != nullptr);
@@ -209,7 +209,7 @@ TEST_F(PolicyMapTest, MergeFrom) {
   a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, base::Value(true), nullptr);
   a.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr,
+        POLICY_SOURCE_ENTERPRISE_DEFAULT, base::nullopt,
         CreateExternalDataFetcher("a"));
   a.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
@@ -228,7 +228,7 @@ TEST_F(PolicyMapTest, MergeFrom) {
   b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr,
+        POLICY_SOURCE_ENTERPRISE_DEFAULT, base::nullopt,
         CreateExternalDataFetcher("b"));
   b.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_DEVICE_LOCAL_ACCOUNT_OVERRIDE, base::Value(true),
@@ -265,7 +265,7 @@ TEST_F(PolicyMapTest, MergeFrom) {
   c.GetMutable(kTestPolicyName2)
       ->AddConflictingPolicy(b.Get(kTestPolicyName2)->DeepCopy());
   c.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr,
+        POLICY_SOURCE_ENTERPRISE_DEFAULT, base::nullopt,
         CreateExternalDataFetcher("a"));
   c.GetMutable(kTestPolicyName3)->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
   c.GetMutable(kTestPolicyName3)
@@ -796,11 +796,11 @@ TEST_F(PolicyMapTest, GetDifferingKeys) {
   a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::Value("google.com"), nullptr);
   a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("dummy"));
+        POLICY_SOURCE_CLOUD, base::nullopt, CreateExternalDataFetcher("dummy"));
   a.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, base::Value(true), nullptr);
   a.Set(kTestPolicyName4, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("a"));
+        POLICY_SOURCE_CLOUD, base::nullopt, CreateExternalDataFetcher("a"));
   a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   a.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
@@ -812,11 +812,11 @@ TEST_F(PolicyMapTest, GetDifferingKeys) {
   b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::Value("google.com"), nullptr);
   b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("dummy"));
+        POLICY_SOURCE_CLOUD, base::nullopt, CreateExternalDataFetcher("dummy"));
   b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   b.Set(kTestPolicyName4, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("b"));
+        POLICY_SOURCE_CLOUD, base::nullopt, CreateExternalDataFetcher("b"));
   b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,