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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/policy/core/browser/configuration_policy_handler_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
« no previous file with comments | « components/policy/core/browser/autofill_policy_handler_unittest.cc ('k') | components/policy/core/browser/configuration_policy_pref_store_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/policy/core/browser/configuration_policy_handler_unittest.cc
diff --git a/components/policy/core/browser/configuration_policy_handler_unittest.cc b/components/policy/core/browser/configuration_policy_handler_unittest.cc
index ba9c73f4fb586c14843730e6b95a6c08452d47a5..eb554284190bb110939cec33062fc05f4292f779 100644
--- a/components/policy/core/browser/configuration_policy_handler_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc
@@ -83,7 +83,7 @@ TEST(StringToIntEnumListPolicyHandlerTest, CheckPolicySettings) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("no list")), NULL);
+ base::MakeUnique<base::StringValue>("no list"), NULL);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -134,21 +134,21 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) {
// Check that values lying in the accepted range are not rejected.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(5), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(10)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(10), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
@@ -157,14 +157,14 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) {
// (because clamping is enabled) but do yield a warning message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(-5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(-5), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(15)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(15), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -173,7 +173,7 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) {
// message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("invalid")), nullptr);
+ base::MakeUnique<base::StringValue>("invalid"), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -190,21 +190,21 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) {
// Check that values lying in the accepted range are not rejected.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(5), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(10)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(10), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
@@ -213,14 +213,14 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) {
// an error message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(-5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(-5), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(15)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(15), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -229,7 +229,7 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) {
// message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("invalid")), nullptr);
+ base::MakeUnique<base::StringValue>("invalid"), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -248,7 +248,7 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) {
// Check that values lying in the accepted range are written to the pref.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0));
@@ -257,7 +257,7 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(5));
@@ -266,7 +266,7 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(10)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(10), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(10));
@@ -277,7 +277,7 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) {
// to the pref.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(-5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(-5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0));
@@ -286,7 +286,7 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(15)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(15), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(10));
@@ -307,7 +307,7 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsDontClamp) {
// Check that values lying in the accepted range are written to the pref.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0));
@@ -316,7 +316,7 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsDontClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(5));
@@ -325,7 +325,7 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsDontClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(10)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(10), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(10));
@@ -345,21 +345,21 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) {
// Check that values lying in the accepted range are not rejected.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(5), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(10)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(10), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
@@ -368,14 +368,14 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) {
// (because clamping is enabled) but do yield a warning message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(-5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(-5), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(15)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(15), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -384,7 +384,7 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) {
// message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("invalid")), nullptr);
+ base::MakeUnique<base::StringValue>("invalid"), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -402,21 +402,21 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) {
// Check that values lying in the accepted range are not rejected.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(5), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(10)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(10), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
@@ -425,14 +425,14 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) {
// an error message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(-5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(-5), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(15)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(15), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -441,7 +441,7 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) {
// message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("invalid")), nullptr);
+ base::MakeUnique<base::StringValue>("invalid"), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -461,7 +461,7 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) {
// Check that values lying in the accepted range are written to the pref.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0.0));
@@ -470,7 +470,7 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0.05));
@@ -479,7 +479,7 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(10)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(10), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0.1));
@@ -490,7 +490,7 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) {
// to the pref.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(-5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(-5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0.0));
@@ -499,7 +499,7 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(15)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(15), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0.1));
@@ -521,7 +521,7 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsDontClamp) {
// Check that values lying in the accepted range are written to the pref.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(0)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(0), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0.0));
@@ -530,7 +530,7 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsDontClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(5)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0.05));
@@ -539,7 +539,7 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsDontClamp) {
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(10)), nullptr);
+ base::MakeUnique<base::FundamentalValue>(10), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
expected.reset(new base::FundamentalValue(0.1));
« no previous file with comments | « components/policy/core/browser/autofill_policy_handler_unittest.cc ('k') | components/policy/core/browser/configuration_policy_pref_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698