Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Unified Diff: components/policy/core/common/policy_loader_win_unittest.cc

Issue 2252353002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/policy/core/common/policy_loader_win_unittest.cc
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index c79dbb6ddc24cb9864ee5c0579a03cc7ee43a7fc..e9e9191c5374e45f255b6119f1403076346f9d05 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc
@@ -817,8 +817,8 @@ TEST_F(PolicyLoaderWinTest, HKLMOverHKCU) {
PolicyBundle expected;
expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set(test_keys::kKeyString, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_PLATFORM,
- base::WrapUnique(new base::StringValue("hklm")), nullptr);
+ POLICY_SOURCE_PLATFORM, base::MakeUnique<base::StringValue>("hklm"),
+ nullptr);
EXPECT_TRUE(Matches(expected));
}
@@ -870,17 +870,17 @@ TEST_F(PolicyLoaderWinTest, Merge3rdPartyPolicies) {
PolicyMap& expected_policy = expected.Get(ns);
expected_policy.Set(
"a", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_SOURCE_PLATFORM,
- base::WrapUnique(new base::StringValue(kMachineMandatory)), nullptr);
+ base::MakeUnique<base::StringValue>(kMachineMandatory), nullptr);
expected_policy.Set(
"b", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM,
- base::WrapUnique(new base::StringValue(kUserMandatory)), nullptr);
- expected_policy.Set(
- "c", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_PLATFORM,
- base::WrapUnique(new base::StringValue(kMachineRecommended)), nullptr);
+ base::MakeUnique<base::StringValue>(kUserMandatory), nullptr);
+ expected_policy.Set("c", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_PLATFORM,
+ base::MakeUnique<base::StringValue>(kMachineRecommended),
+ nullptr);
expected_policy.Set(
"d", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM,
- base::WrapUnique(new base::StringValue(kUserRecommended)), nullptr);
+ base::MakeUnique<base::StringValue>(kUserRecommended), nullptr);
EXPECT_TRUE(Matches(expected));
}
« no previous file with comments | « components/policy/core/common/policy_loader_mac_unittest.cc ('k') | components/policy/core/common/policy_map_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698