Index: components/policy/core/common/policy_service_impl_unittest.cc |
diff --git a/components/policy/core/common/policy_service_impl_unittest.cc b/components/policy/core/common/policy_service_impl_unittest.cc |
index da73e0970d33ad8aa238833d77e1e8450355097a..8cbdc0595bd89fbe3108e014b5ce70cbc13eeecd 100644 |
--- a/components/policy/core/common/policy_service_impl_unittest.cc |
+++ b/components/policy/core/common/policy_service_impl_unittest.cc |
@@ -82,7 +82,7 @@ class ChangePolicyObserver : public PolicyService::Observer { |
PolicyMap new_policy; |
new_policy.Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(14), nullptr); |
+ base::MakeUnique<base::Value>(14), nullptr); |
provider_->UpdateChromePolicy(new_policy); |
observer_invoked_ = true; |
} |
@@ -113,7 +113,7 @@ class PolicyServiceTest : public testing::Test { |
policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_ENTERPRISE_DEFAULT, |
- base::MakeUnique<base::FundamentalValue>(13), nullptr); |
+ base::MakeUnique<base::Value>(13), nullptr); |
provider0_.UpdateChromePolicy(policy0_); |
PolicyServiceImpl::Providers providers; |
@@ -163,7 +163,7 @@ TEST_F(PolicyServiceTest, LoadsPoliciesBeforeProvidersRefresh) { |
PolicyMap expected; |
expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_ENTERPRISE_DEFAULT, |
- base::MakeUnique<base::FundamentalValue>(13), nullptr); |
+ base::MakeUnique<base::Value>(13), nullptr); |
EXPECT_TRUE(VerifyPolicies( |
PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected)); |
} |
@@ -175,16 +175,16 @@ TEST_F(PolicyServiceTest, NotifyObservers) { |
PolicyMap expectedPrevious; |
expectedPrevious.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_ENTERPRISE_DEFAULT, |
- base::MakeUnique<base::FundamentalValue>(13), nullptr); |
+ base::MakeUnique<base::Value>(13), nullptr); |
PolicyMap expectedCurrent; |
expectedCurrent.CopyFrom(expectedPrevious); |
expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(123), nullptr); |
+ base::MakeUnique<base::Value>(123), nullptr); |
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(123), nullptr); |
+ base::MakeUnique<base::Value>(123), nullptr); |
EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME, |
std::string()), |
PolicyEquals(&expectedPrevious), |
@@ -203,10 +203,10 @@ TEST_F(PolicyServiceTest, NotifyObservers) { |
expectedPrevious.CopyFrom(expectedCurrent); |
expectedCurrent.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(456), nullptr); |
+ base::MakeUnique<base::Value>(456), nullptr); |
policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(456), nullptr); |
+ base::MakeUnique<base::Value>(456), nullptr); |
EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME, |
std::string()), |
PolicyEquals(&expectedPrevious), |
@@ -229,10 +229,10 @@ TEST_F(PolicyServiceTest, NotifyObservers) { |
expectedPrevious.CopyFrom(expectedCurrent); |
expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(789), nullptr); |
+ base::MakeUnique<base::Value>(789), nullptr); |
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(789), nullptr); |
+ base::MakeUnique<base::Value>(789), nullptr); |
EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME, |
std::string()), |
@@ -263,7 +263,7 @@ TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) { |
PolicyMap previous_policy_map; |
previous_policy_map.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_ENTERPRISE_DEFAULT, |
- base::MakeUnique<base::FundamentalValue>(13), |
+ base::MakeUnique<base::Value>(13), |
nullptr); |
PolicyMap policy_map; |
policy_map.CopyFrom(previous_policy_map); |
@@ -346,10 +346,10 @@ TEST_F(PolicyServiceTest, ObserverChangesPolicy) { |
policy_service_->AddObserver(POLICY_DOMAIN_CHROME, &observer); |
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(123), nullptr); |
+ base::MakeUnique<base::Value>(123), nullptr); |
policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(1234), nullptr); |
+ base::MakeUnique<base::Value>(1234), nullptr); |
// Should not crash. |
provider0_.UpdateChromePolicy(policy0_); |
policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, &observer); |
@@ -360,18 +360,18 @@ TEST_F(PolicyServiceTest, Priorities) { |
PolicyMap expected; |
expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_ENTERPRISE_DEFAULT, |
- base::MakeUnique<base::FundamentalValue>(13), nullptr); |
+ base::MakeUnique<base::Value>(13), nullptr); |
expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(0), |
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(0), |
nullptr); |
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(0), |
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(0), |
nullptr); |
policy1_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(1), |
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(1), |
nullptr); |
policy2_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(2), |
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(2), |
nullptr); |
provider0_.UpdateChromePolicy(policy0_); |
provider1_.UpdateChromePolicy(policy1_); |
@@ -380,7 +380,7 @@ TEST_F(PolicyServiceTest, Priorities) { |
PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected)); |
expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(1), |
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(1), |
nullptr); |
policy0_.Erase("aaa"); |
provider0_.UpdateChromePolicy(policy0_); |
@@ -388,10 +388,10 @@ TEST_F(PolicyServiceTest, Priorities) { |
PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected)); |
expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(2), |
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(2), |
nullptr); |
policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(1), |
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(1), |
nullptr); |
provider1_.UpdateChromePolicy(policy1_); |
EXPECT_TRUE(VerifyPolicies( |
@@ -415,7 +415,7 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) { |
Mock::VerifyAndClearExpectations(this); |
// Changing it now triggers a notification. |
- base::FundamentalValue kValue0(0); |
+ base::Value kValue0(0); |
EXPECT_CALL(*this, OnPolicyValueUpdated(NULL, ValueEquals(&kValue0))); |
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, kValue0.CreateDeepCopy(), nullptr); |
@@ -430,7 +430,7 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) { |
Mock::VerifyAndClearExpectations(this); |
// Modifying the value triggers a notification. |
- base::FundamentalValue kValue1(1); |
+ base::Value kValue1(1); |
EXPECT_CALL(*this, OnPolicyValueUpdated(ValueEquals(&kValue0), |
ValueEquals(&kValue1))); |
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
@@ -470,14 +470,14 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { |
Mock::VerifyAndClearExpectations(this); |
EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); |
- base::FundamentalValue kValue0(0); |
+ base::Value kValue0(0); |
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, kValue0.CreateDeepCopy(), nullptr); |
provider0_.UpdateChromePolicy(policy0_); |
Mock::VerifyAndClearExpectations(this); |
EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); |
- base::FundamentalValue kValue1(1); |
+ base::Value kValue1(1); |
policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, kValue1.CreateDeepCopy(), nullptr); |
provider1_.UpdateChromePolicy(policy1_); |
@@ -509,7 +509,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { |
// Providers 0 and 1 must reload again. |
EXPECT_CALL(*this, OnPolicyRefresh()).Times(2); |
- base::FundamentalValue kValue2(2); |
+ base::Value kValue2(2); |
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
POLICY_SOURCE_CLOUD, kValue2.CreateDeepCopy(), nullptr); |
provider0_.UpdateChromePolicy(policy0_); |
@@ -672,7 +672,7 @@ TEST_F(PolicyServiceTest, FixDeprecatedPolicies) { |
// into a dictionary. |
policy_map.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(3), nullptr); |
+ base::MakeUnique<base::Value>(3), nullptr); |
// Both these policies should be ignored, since there's a higher priority |
// policy available. |
@@ -687,7 +687,7 @@ TEST_F(PolicyServiceTest, FixDeprecatedPolicies) { |
// Add a value to a non-Chrome namespace. |
policy_bundle->Get(extension_namespace) |
.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(3), |
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(3), |
nullptr); |
// The resulting Chrome namespace map should have the collected policy. |
@@ -703,7 +703,7 @@ TEST_F(PolicyServiceTest, FixDeprecatedPolicies) { |
PolicyMap expected_extension; |
expected_extension.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, |
- base::MakeUnique<base::FundamentalValue>(3), nullptr); |
+ base::MakeUnique<base::Value>(3), nullptr); |
provider0_.UpdatePolicy(std::move(policy_bundle)); |
RunUntilIdle(); |