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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/policy/core/browser/configuration_policy_handler_unittest.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month 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 7e608596b89542b2e251fb12dfbe79ed13412664..cb20cdb63ce49d972ed9576db177e29212d2fd1b 100644
--- a/components/policy/core/browser/configuration_policy_handler_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc
@@ -27,10 +27,10 @@ void GetIntegerTypeMap(
result) {
result->push_back(
base::MakeUnique<StringMappingListPolicyHandler::MappingEntry>(
- "one", std::unique_ptr<base::Value>(new base::FundamentalValue(1))));
+ "one", std::unique_ptr<base::Value>(new base::Value(1))));
result->push_back(
base::MakeUnique<StringMappingListPolicyHandler::MappingEntry>(
- "two", std::unique_ptr<base::Value>(new base::FundamentalValue(2))));
+ "two", std::unique_ptr<base::Value>(new base::Value(2))));
}
const char kTestPolicy[] = "unit_test.test_policy";
@@ -137,21 +137,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::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(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::MakeUnique<base::FundamentalValue>(5), nullptr);
+ base::MakeUnique<base::Value>(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::MakeUnique<base::FundamentalValue>(10), nullptr);
+ base::MakeUnique<base::Value>(10), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
@@ -160,14 +160,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::MakeUnique<base::FundamentalValue>(-5), nullptr);
+ base::MakeUnique<base::Value>(-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::MakeUnique<base::FundamentalValue>(15), nullptr);
+ base::MakeUnique<base::Value>(15), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -193,21 +193,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::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(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::MakeUnique<base::FundamentalValue>(5), nullptr);
+ base::MakeUnique<base::Value>(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::MakeUnique<base::FundamentalValue>(10), nullptr);
+ base::MakeUnique<base::Value>(10), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
@@ -216,14 +216,14 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) {
// an error message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(-5), nullptr);
+ base::MakeUnique<base::Value>(-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::MakeUnique<base::FundamentalValue>(15), nullptr);
+ base::MakeUnique<base::Value>(15), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -251,28 +251,28 @@ 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::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(0), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0));
+ expected.reset(new base::Value(0));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(5), nullptr);
+ base::MakeUnique<base::Value>(5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(5));
+ expected.reset(new base::Value(5));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(10), nullptr);
+ base::MakeUnique<base::Value>(10), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(10));
+ expected.reset(new base::Value(10));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
@@ -280,19 +280,19 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) {
// to the pref.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(-5), nullptr);
+ base::MakeUnique<base::Value>(-5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0));
+ expected.reset(new base::Value(0));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(15), nullptr);
+ base::MakeUnique<base::Value>(15), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(10));
+ expected.reset(new base::Value(10));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
}
@@ -310,28 +310,28 @@ 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::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(0), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0));
+ expected.reset(new base::Value(0));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(5), nullptr);
+ base::MakeUnique<base::Value>(5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(5));
+ expected.reset(new base::Value(5));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(10), nullptr);
+ base::MakeUnique<base::Value>(10), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(10));
+ expected.reset(new base::Value(10));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
}
@@ -348,21 +348,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::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(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::MakeUnique<base::FundamentalValue>(5), nullptr);
+ base::MakeUnique<base::Value>(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::MakeUnique<base::FundamentalValue>(10), nullptr);
+ base::MakeUnique<base::Value>(10), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
@@ -371,14 +371,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::MakeUnique<base::FundamentalValue>(-5), nullptr);
+ base::MakeUnique<base::Value>(-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::MakeUnique<base::FundamentalValue>(15), nullptr);
+ base::MakeUnique<base::Value>(15), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -405,21 +405,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::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(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::MakeUnique<base::FundamentalValue>(5), nullptr);
+ base::MakeUnique<base::Value>(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::MakeUnique<base::FundamentalValue>(10), nullptr);
+ base::MakeUnique<base::Value>(10), nullptr);
errors.Clear();
EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_TRUE(errors.empty());
@@ -428,14 +428,14 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) {
// an error message.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(-5), nullptr);
+ base::MakeUnique<base::Value>(-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::MakeUnique<base::FundamentalValue>(15), nullptr);
+ base::MakeUnique<base::Value>(15), nullptr);
errors.Clear();
EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
EXPECT_FALSE(errors.empty());
@@ -464,28 +464,28 @@ 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::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(0), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0.0));
+ expected.reset(new base::Value(0.0));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(5), nullptr);
+ base::MakeUnique<base::Value>(5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0.05));
+ expected.reset(new base::Value(0.05));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(10), nullptr);
+ base::MakeUnique<base::Value>(10), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0.1));
+ expected.reset(new base::Value(0.1));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
@@ -493,19 +493,19 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) {
// to the pref.
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(-5), nullptr);
+ base::MakeUnique<base::Value>(-5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0.0));
+ expected.reset(new base::Value(0.0));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(15), nullptr);
+ base::MakeUnique<base::Value>(15), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0.1));
+ expected.reset(new base::Value(0.1));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
}
@@ -524,28 +524,28 @@ 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::MakeUnique<base::FundamentalValue>(0), nullptr);
+ base::MakeUnique<base::Value>(0), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0.0));
+ expected.reset(new base::Value(0.0));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(5), nullptr);
+ base::MakeUnique<base::Value>(5), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0.05));
+ expected.reset(new base::Value(0.05));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(10), nullptr);
+ base::MakeUnique<base::Value>(10), nullptr);
prefs.Clear();
handler.ApplyPolicySettings(policy_map, &prefs);
- expected.reset(new base::FundamentalValue(0.1));
+ expected.reset(new base::Value(0.1));
EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
EXPECT_TRUE(base::Value::Equals(expected.get(), value));
}
« 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