Migrate PolicyMap::Set to use base::Value

Changed PolicyMap::Set to pass value parameter
as base::Value instead of unique_ptr.

Bug: 2270317
Change-Id: I18dd2696a46ee64b13254b41a36b011b7d29c3de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284840Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Aya Elsayed <ayaelattar@google.com>
Cr-Commit-Position: refs/heads/master@{#786408}

chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc

@@ -524,8 +524,8 @@ TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) {
       chromeos::onc::test_utils::ReadTestData("toplevel_partially_invalid.onc");
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(onc_policy), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(onc_policy),
+             nullptr);
   UpdateProviderPolicy(policy);
 
   EXPECT_CALL(network_config_handler_,
@@ -564,8 +564,8 @@ TEST_F(NetworkConfigurationUpdaterTest,
 
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kFakeONC), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kFakeONC),
+             nullptr);
   UpdateProviderPolicy(policy);
   MarkPolicyProviderInitialized();
   base::RunLoop().RunUntilIdle();
@@ -616,8 +616,8 @@ TEST_F(NetworkConfigurationUpdaterTest,
   // Change to ONC policy with web trust certs.
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kFakeONC), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kFakeONC),
+             nullptr);
   UpdateProviderPolicy(policy);
   base::RunLoop().RunUntilIdle();
 
@@ -651,8 +651,7 @@ TEST_F(NetworkConfigurationUpdaterTest, ExtensionScopedWebTrustedCertificate) {
   PolicyMap policy;
   policy.Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kFakeONCWithExtensionScopedCert),
-             nullptr);
+             base::Value(kFakeONCWithExtensionScopedCert), nullptr);
   UpdateProviderPolicy(policy);
   MarkPolicyProviderInitialized();
   base::RunLoop().RunUntilIdle();
@@ -681,8 +680,8 @@ TEST_F(NetworkConfigurationUpdaterTest,
        DontImportCertificateBeforeCertificateImporterSet) {
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kFakeONC), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kFakeONC),
+             nullptr);
   UpdateProviderPolicy(policy);
 
   ::onc::ONCSource source = onc::ONC_SOURCE_USER_POLICY;
@@ -711,8 +710,8 @@ TEST_F(NetworkConfigurationUpdaterTest,
 TEST_F(NetworkConfigurationUpdaterTest, ReplaceDeviceOncPlaceholders) {
   PolicyMap policy;
   policy.Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kFakeONC), nullptr);
+             POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, base::Value(kFakeONC),
+             nullptr);
   UpdateProviderPolicy(policy);
 
   ::onc::ONCSource source = onc::ONC_SOURCE_DEVICE_POLICY;
@@ -754,7 +753,7 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsNo) {
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kONCWithoutWebTrustedCert), nullptr);
+             base::Value(kONCWithoutWebTrustedCert), nullptr);
   EXPECT_FALSE(
       UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate(
           policy));
@@ -792,7 +791,7 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsYes) {
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kONCWithWebTrustedCert), nullptr);
+             base::Value(kONCWithWebTrustedCert), nullptr);
   EXPECT_TRUE(
       UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate(
           policy));
@@ -809,8 +808,8 @@ TEST(UserNetworkConfigurationStaticsTest, TestHasWebTrustedCertsInvalidPolicy) {
   const char kInvalidONC[] = "not even valid json";
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kInvalidONC), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kInvalidONC),
+             nullptr);
   EXPECT_FALSE(
       UserNetworkConfigurationUpdater::PolicyHasWebTrustedAuthorityCertificate(
           policy));
@@ -855,8 +854,7 @@ class NetworkConfigurationUpdaterTestWithParam
 TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) {
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(kFakeONC),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(kFakeONC), nullptr);
   UpdateProviderPolicy(policy);
 
   EXPECT_CALL(
@@ -877,8 +875,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam,
        PolicyNotSetBeforePolicyProviderInitialized) {
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(kFakeONC),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(kFakeONC), nullptr);
   UpdateProviderPolicy(policy);
 
   CreateNetworkConfigurationUpdater();
@@ -905,8 +902,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam,
 
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(kFakeONC),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(kFakeONC), nullptr);
   UpdateProviderPolicy(policy);
 
   EXPECT_CALL(
@@ -946,8 +942,7 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) {
 
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(kFakeONC),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(kFakeONC), nullptr);
   UpdateProviderPolicy(policy);
   Mock::VerifyAndClearExpectations(&network_config_handler_);
   EXPECT_EQ(ExpectedImportCertificatesCallCount(),

components/policy/core/common/schema_map_unittest.cc

@@ -6,6 +6,7 @@
 #include <memory>
 
 #include "base/memory/weak_ptr.h"
+#include "base/optional.h"
 #include "base/values.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/external_data_manager.h"
@@ -141,17 +142,16 @@ TEST_F(SchemaMapTest, FilterBundle) {
   // The Chrome namespace isn't filtered.
   PolicyBundle expected_bundle;
   PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
-  expected_bundle.Get(chrome_ns).Set(
-      "ChromePolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-      POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value"), nullptr);
+  expected_bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY,
+                                     POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+                                     base::Value("value"), nullptr);
   bundle.CopyFrom(expected_bundle);
 
   // Unknown components are filtered out.
   PolicyNamespace another_extension_ns(POLICY_DOMAIN_EXTENSIONS, "xyz");
   bundle.Get(another_extension_ns)
       .Set("AnotherExtensionPolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value"), nullptr);
   schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true);
   EXPECT_TRUE(bundle.Equals(expected_bundle));
 
@@ -161,26 +161,25 @@ TEST_F(SchemaMapTest, FilterBundle) {
   list.AppendString("a");
   list.AppendString("b");
   map.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-          POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
+          POLICY_SOURCE_CLOUD, list.Clone(), nullptr);
   map.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-          POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(true), nullptr);
+          POLICY_SOURCE_CLOUD, base::Value(true), nullptr);
   map.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-          POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr);
+          POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
   map.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-          POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1.2), nullptr);
+          POLICY_SOURCE_CLOUD, base::Value(1.2), nullptr);
   base::DictionaryValue dict;
   dict.SetString("a", "b");
   dict.SetInteger("b", 2);
   map.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-          POLICY_SOURCE_CLOUD, dict.CreateDeepCopy(), nullptr);
+          POLICY_SOURCE_CLOUD, dict.Clone(), nullptr);
   map.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-          POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value"), nullptr);
+          POLICY_SOURCE_CLOUD, base::Value("value"), nullptr);
 
   bundle.MergeFrom(expected_bundle);
   bundle.Get(extension_ns)
       .Set("Unexpected", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("to-be-removed"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("to-be-removed"), nullptr);
 
   schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true);
   // Merged twice so this causes a conflict.
@@ -197,24 +196,19 @@ TEST_F(SchemaMapTest, FilterBundle) {
   bundle.Clear();
   PolicyMap& badmap = bundle.Get(extension_ns);
   badmap.Set("list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   badmap.Set("boolean", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(0), nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(0), nullptr);
   badmap.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   badmap.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   badmap.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   badmap.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(false),
-             nullptr);
+             POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
   badmap.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, nullptr,
+             POLICY_SOURCE_CLOUD, base::nullopt,
              std::make_unique<ExternalDataFetcher>(nullptr, std::string()));
 
   schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true);
@@ -246,14 +240,13 @@ TEST_F(SchemaMapTest, LegacyComponents) {
   PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "with-schema");
   bundle.Get(extension_ns)
       .Set("String", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 1"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value 1"), nullptr);
 
   // The Chrome namespace isn't filtered.
   PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
   bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY,
                             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                            std::make_unique<base::Value>("value 3"), nullptr);
+                            base::Value("value 3"), nullptr);
 
   PolicyBundle expected_bundle;
   expected_bundle.MergeFrom(bundle);
@@ -262,22 +255,19 @@ TEST_F(SchemaMapTest, LegacyComponents) {
   PolicyNamespace without_schema_ns(POLICY_DOMAIN_EXTENSIONS, "without-schema");
   bundle.Get(without_schema_ns)
       .Set("Schemaless", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 2"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value 2"), nullptr);
 
   // Unknown policies of known components with a schema are removed when
   // |drop_invalid_component_policies| is true in the FilterBundle call.
   bundle.Get(extension_ns)
       .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 4"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value 4"), nullptr);
 
   // Unknown components are removed.
   PolicyNamespace unknown_ns(POLICY_DOMAIN_EXTENSIONS, "unknown");
   bundle.Get(unknown_ns)
       .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 5"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value 5"), nullptr);
 
   schema_map->FilterBundle(&bundle, /*drop_invalid_component_policies=*/true);
   EXPECT_TRUE(bundle.Equals(expected_bundle));
@@ -308,28 +298,25 @@ TEST_F(SchemaMapTest, FilterBundleInvalidatesPolicies) {
   PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "with-schema");
   bundle.Get(extension_ns)
       .Set("String", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 1"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value 1"), nullptr);
 
   // The Chrome namespace isn't filtered.
   PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
   bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY,
                             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                            std::make_unique<base::Value>("value 3"), nullptr);
+                            base::Value("value 3"), nullptr);
 
   // Unknown policies of known components with a schema are invalidated when
   // |drop_invalid_component_policies| is false in the FilterBundle call.
   bundle.Get(extension_ns)
       .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 4"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value 4"), nullptr);
 
   // Known components without a schema are also invalidated.
   PolicyNamespace without_schema_ns(POLICY_DOMAIN_EXTENSIONS, "without-schema");
   bundle.Get(without_schema_ns)
       .Set("Schemaless", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 2"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value 2"), nullptr);
 
   PolicyBundle expected_bundle;
   expected_bundle.MergeFrom(bundle);
@@ -341,8 +328,7 @@ TEST_F(SchemaMapTest, FilterBundleInvalidatesPolicies) {
   PolicyNamespace unknown_ns(POLICY_DOMAIN_EXTENSIONS, "unknown");
   bundle.Get(unknown_ns)
       .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value 5"),
-           nullptr);
+           POLICY_SOURCE_CLOUD, base::Value("value 5"), nullptr);
 
   // Get a reference to the policies that will be invalidated now, since it can
   // no longer be accessed with Get() after being invalidated.

components/search_engines/default_search_policy_handler_unittest.cc

@@ -74,42 +74,42 @@ const char DefaultSearchPolicyHandlerTest::kHostName[] = "test.com";
 
 void DefaultSearchPolicyHandlerTest::
     BuildDefaultSearchPolicy(PolicyMap* policy) {
-  base::ListValue* encodings = new base::ListValue();
-  encodings->AppendString("UTF-16");
-  encodings->AppendString("UTF-8");
+  base::Value encodings(base::Value::Type::LIST);
+  encodings.Append("UTF-16");
+  encodings.Append("UTF-8");
   policy->Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(true), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(true),
+              nullptr);
   policy->Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(kSearchURL), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kSearchURL),
+              nullptr);
   policy->Set(key::kDefaultSearchProviderName, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(kName), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kName),
+              nullptr);
   policy->Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(kKeyword), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kKeyword),
+              nullptr);
   policy->Set(key::kDefaultSearchProviderSuggestURL, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(kSuggestURL), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kSuggestURL),
+              nullptr);
   policy->Set(key::kDefaultSearchProviderIconURL, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(kIconURL), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kIconURL),
+              nullptr);
   policy->Set(key::kDefaultSearchProviderEncodings, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::WrapUnique(encodings), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, std::move(encodings),
+              nullptr);
   policy->Set(key::kDefaultSearchProviderAlternateURLs, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              default_alternate_urls_.CreateDeepCopy(), nullptr);
+              default_alternate_urls_.Clone(), nullptr);
   policy->Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(kImageURL), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kImageURL),
+              nullptr);
   policy->Set(key::kDefaultSearchProviderImageURLPostParams,
               POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(kImageParams), nullptr);
+              base::Value(kImageParams), nullptr);
   policy->Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY,
-              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              std::make_unique<base::Value>(kNewTabURL), nullptr);
+              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kNewTabURL),
+              nullptr);
 }
 
 // Checks that if the default search policy is missing, that no elements of the
@@ -133,7 +133,7 @@ TEST_F(DefaultSearchPolicyHandlerTest, Invalid) {
   const char bad_search_url[] = "http://test.com/noSearchTerms";
   policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(bad_search_url), nullptr);
+             base::Value(bad_search_url), nullptr);
   UpdateProviderPolicy(policy);
 
   const base::Value* temp = nullptr;
@@ -168,13 +168,12 @@ TEST_F(DefaultSearchPolicyHandlerTest, InvalidType) {
     EXPECT_TRUE(store_->GetValue(
         DefaultSearchManager::kDefaultSearchProviderDataPrefName, &temp));
 
-    auto old_value = base::WrapUnique(policy.GetValue(policy_name)->DeepCopy());
+    auto old_value = policy.GetValue(policy_name)->Clone();
     // BinaryValue is not supported in any current default search policy params.
     // Try changing policy param to BinaryValue and check that policy becomes
     // invalid.
     policy.Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
-               std::make_unique<base::Value>(base::Value::Type::BINARY),
+               POLICY_SOURCE_CLOUD, base::Value(base::Value::Type::BINARY),
                nullptr);
     UpdateProviderPolicy(policy);
 
@@ -248,11 +247,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, FullyDefined) {
 TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicy) {
   PolicyMap policy;
   policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(false), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(false),
+             nullptr);
   policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>("http://a/?{searchTerms}"), nullptr);
+             base::Value("http://a/?{searchTerms}"), nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* temp = nullptr;
   // Ignore any other search provider related policy in this case.
@@ -274,7 +273,7 @@ TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicyNotSet) {
   PolicyMap policy;
   policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>("http://a/?{searchTerms}"), nullptr);
+             base::Value("http://a/?{searchTerms}"), nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* temp = nullptr;
   EXPECT_FALSE(store_->GetValue(
@@ -287,11 +286,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, DisabledByPolicyNotSet) {
 TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) {
   PolicyMap policy;
   policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(true), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(true),
+             nullptr);
   policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kSearchURL), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(kSearchURL),
+             nullptr);
   UpdateProviderPolicy(policy);
 
   const base::Value* temp = nullptr;
@@ -340,11 +339,11 @@ TEST_F(DefaultSearchPolicyHandlerTest, MinimallyDefined) {
 TEST_F(DefaultSearchPolicyHandlerTest, FileURL) {
   PolicyMap policy;
   policy.Set(key::kDefaultSearchProviderEnabled, POLICY_LEVEL_MANDATORY,
-             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(true), nullptr);
+             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(true),
+             nullptr);
   policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(kFileSearchURL), nullptr);
+             base::Value(kFileSearchURL), nullptr);
   UpdateProviderPolicy(policy);
 
   const base::Value* temp = nullptr;

components/sync/driver/sync_policy_handler_unittest.cc

@@ -34,7 +34,7 @@ TEST(SyncPolicyHandlerTest, Enabled) {
   policy::PolicyMap policy;
   policy.Set(policy::key::kSyncDisabled, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(false), nullptr);
+             base::Value(false), nullptr);
   SyncPolicyHandler handler;
   PrefValueMap prefs;
   handler.ApplyPolicySettings(policy, &prefs);
@@ -47,7 +47,7 @@ TEST(SyncPolicyHandlerTest, Disabled) {
   policy::PolicyMap policy;
   policy.Set(policy::key::kSyncDisabled, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             std::make_unique<base::Value>(true), nullptr);
+             base::Value(true), nullptr);
   SyncPolicyHandler handler;
   PrefValueMap prefs;
   handler.ApplyPolicySettings(policy, &prefs);
@@ -77,8 +77,7 @@ TEST(SyncPolicyHandlerTest, SyncTypesListDisabled) {
   disabled_types.AppendString("preferences");
   policy.Set(policy::key::kSyncTypesListDisabled,
              policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
-             policy::POLICY_SOURCE_CLOUD, disabled_types.CreateDeepCopy(),
-             nullptr);
+             policy::POLICY_SOURCE_CLOUD, disabled_types.Clone(), nullptr);
   SyncPolicyHandler handler;
   handler.ApplyPolicySettings(policy, &prefs);
 
@@ -121,8 +120,7 @@ TEST_F(SyncPolicyHandlerOsTest, SyncTypesListDisabled_OsTypes) {
   disabled_types.AppendString("osWifiConfigurations");
   policy.Set(policy::key::kSyncTypesListDisabled,
              policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
-             policy::POLICY_SOURCE_CLOUD, disabled_types.CreateDeepCopy(),
-             nullptr);
+             policy::POLICY_SOURCE_CLOUD, disabled_types.Clone(), nullptr);
   SyncPolicyHandler handler;
   handler.ApplyPolicySettings(policy, &prefs);
 
@@ -151,8 +149,7 @@ TEST_F(SyncPolicyHandlerOsTest, SyncTypesListDisabled_MigratedTypes) {
   disabled_types.AppendString("preferences");
   policy.Set(policy::key::kSyncTypesListDisabled,
              policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
-             policy::POLICY_SOURCE_CLOUD, disabled_types.CreateDeepCopy(),
-             nullptr);
+             policy::POLICY_SOURCE_CLOUD, disabled_types.Clone(), nullptr);
   SyncPolicyHandler handler;
   handler.ApplyPolicySettings(policy, &prefs);