Skip to content

GitLab

T
tangled
Commit f7640478 authored by Aya ElAttar's avatar Aya ElAttar Committed by Commit Bot
Browse files
Options

Migrate PolicyMap::Set to use base::Value 

Bug: 2270317
Change-Id: I756802a8ac8d8a526f4cf6a5f4c5f15c6fe8ddfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2282925Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Commit-Queue: Aya Elsayed <ayaelattar@google.com>
Auto-Submit: Aya Elsayed <ayaelattar@google.com>
Cr-Commit-Position: refs/heads/master@{#785979}
parent 5ca1398e
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 139 deletions
components/policy/core/common/policy_bundle_unittest.cc
View file @ f7640478
...@@ -32,13 +32,11 @@ const char kExtension3[] = "extension-3"; ...@@ -32,13 +32,11 @@ const char kExtension3[] = "extension-3";
// Adds test policies to |policy|. // Adds test policies to |policy|.
void AddTestPolicies(PolicyMap* policy) { void AddTestPolicies(PolicyMap* policy) {
policy->Set("mandatory-user", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy->Set("mandatory-user", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), nullptr); POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
policy->Set("mandatory-machine", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, policy->Set("mandatory-machine", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("omg"), POLICY_SOURCE_CLOUD, base::Value("omg"), nullptr);
nullptr);
policy->Set("recommended-user", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, policy->Set("recommended-user", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(true), POLICY_SOURCE_CLOUD, base::Value(true), nullptr);
nullptr);
std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
dict->SetBoolean("false", false); dict->SetBoolean("false", false);
dict->SetInteger("int", 456); dict->SetInteger("int", 456);
...@@ -58,13 +56,11 @@ void AddTestPoliciesWithParams(PolicyMap *policy, ...@@ -58,13 +56,11 @@ void AddTestPoliciesWithParams(PolicyMap *policy,
PolicyLevel level, PolicyLevel level,
PolicyScope scope) { PolicyScope scope) {
policy->Set(kPolicyClashing0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy->Set(kPolicyClashing0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(value), POLICY_SOURCE_CLOUD, base::Value(value), nullptr);
nullptr);
policy->Set(kPolicyClashing1, level, scope, POLICY_SOURCE_CLOUD, policy->Set(kPolicyClashing1, level, scope, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>(value), nullptr); base::Value(value), nullptr);
policy->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(value), POLICY_SOURCE_CLOUD, base::Value(value), nullptr);
nullptr);
} }
// Returns true if |bundle| is empty. // Returns true if |bundle| is empty.
...@@ -192,7 +188,7 @@ TEST(PolicyBundleTest, MergeFrom) { ...@@ -192,7 +188,7 @@ TEST(PolicyBundleTest, MergeFrom) {
// - kPolicyN are merged from each bundle. // - kPolicyN are merged from each bundle.
PolicyMap expected; PolicyMap expected;
expected.Set(kPolicyClashing0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set(kPolicyClashing0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(0), nullptr); POLICY_SOURCE_CLOUD, base::Value(0), nullptr);
expected.GetMutable(kPolicyClashing0) expected.GetMutable(kPolicyClashing0)
->AddConflictingPolicy(policy1.Get(kPolicyClashing0)->DeepCopy()); ->AddConflictingPolicy(policy1.Get(kPolicyClashing0)->DeepCopy());
expected.GetMutable(kPolicyClashing0) expected.GetMutable(kPolicyClashing0)
...@@ -202,7 +198,7 @@ TEST(PolicyBundleTest, MergeFrom) { ...@@ -202,7 +198,7 @@ TEST(PolicyBundleTest, MergeFrom) {
expected.GetMutable(kPolicyClashing0) expected.GetMutable(kPolicyClashing0)
->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE); ->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
expected.Set(kPolicyClashing1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, expected.Set(kPolicyClashing1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr); POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
expected.GetMutable(kPolicyClashing1) expected.GetMutable(kPolicyClashing1)
->AddConflictingPolicy(policy0.Get(kPolicyClashing1)->DeepCopy()); ->AddConflictingPolicy(policy0.Get(kPolicyClashing1)->DeepCopy());
expected.GetMutable(kPolicyClashing1) expected.GetMutable(kPolicyClashing1)
...@@ -212,11 +208,11 @@ TEST(PolicyBundleTest, MergeFrom) { ...@@ -212,11 +208,11 @@ TEST(PolicyBundleTest, MergeFrom) {
expected.GetMutable(kPolicyClashing1) expected.GetMutable(kPolicyClashing1)
->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE); ->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
expected.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(0), nullptr); POLICY_SOURCE_CLOUD, base::Value(0), nullptr);
expected.Set(kPolicy1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set(kPolicy1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr); POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
expected.Set(kPolicy2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set(kPolicy2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(2), nullptr); POLICY_SOURCE_CLOUD, base::Value(2), nullptr);
EXPECT_TRUE(merged.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, EXPECT_TRUE(merged.Get(PolicyNamespace(POLICY_DOMAIN_CHROME,
std::string())).Equals(expected)); std::string())).Equals(expected));
EXPECT_TRUE(merged.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, EXPECT_TRUE(merged.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS,
...@@ -256,13 +252,13 @@ TEST(PolicyBundleTest, Equals) { ...@@ -256,13 +252,13 @@ TEST(PolicyBundleTest, Equals) {
other.CopyFrom(bundle); other.CopyFrom(bundle);
bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), nullptr); POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
EXPECT_FALSE(bundle.Equals(other)); EXPECT_FALSE(bundle.Equals(other));
other.CopyFrom(bundle); other.CopyFrom(bundle);
EXPECT_TRUE(bundle.Equals(other)); EXPECT_TRUE(bundle.Equals(other));
bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, .Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), nullptr); POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
EXPECT_FALSE(bundle.Equals(other)); EXPECT_FALSE(bundle.Equals(other));
// Test non-const Get(). // Test non-const Get().
...@@ -272,8 +268,7 @@ TEST(PolicyBundleTest, Equals) { ...@@ -272,8 +268,7 @@ TEST(PolicyBundleTest, Equals) {
bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())); bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
EXPECT_TRUE(bundle.Equals(other)); EXPECT_TRUE(bundle.Equals(other));
policy_map.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy_map.Set(kPolicy0, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
nullptr);
EXPECT_FALSE(bundle.Equals(other)); EXPECT_FALSE(bundle.Equals(other));
} }
......
components/policy/core/common/policy_map_unittest.cc
View file @ f7640478
...@@ -95,7 +95,7 @@ TEST_F(PolicyMapTest, SetAndGet) { ...@@ -95,7 +95,7 @@ TEST_F(PolicyMapTest, SetAndGet) {
ExternalDataFetcher::Equals(entry->external_data_fetcher.get(), ExternalDataFetcher::Equals(entry->external_data_fetcher.get(),
CreateExternalDataFetcher("dummy").get())); CreateExternalDataFetcher("dummy").get()));
map.Set(kTestPolicyName1, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, map.Set(kTestPolicyName1, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr, nullptr); POLICY_SOURCE_ENTERPRISE_DEFAULT, base::nullopt, nullptr);
EXPECT_FALSE(map.GetValue(kTestPolicyName1)); EXPECT_FALSE(map.GetValue(kTestPolicyName1));
entry = map.Get(kTestPolicyName1); entry = map.Get(kTestPolicyName1);
ASSERT_TRUE(entry != nullptr); ASSERT_TRUE(entry != nullptr);
...@@ -209,7 +209,7 @@ TEST_F(PolicyMapTest, MergeFrom) { ...@@ -209,7 +209,7 @@ TEST_F(PolicyMapTest, MergeFrom) {
a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, base::Value(true), nullptr); POLICY_SOURCE_CLOUD, base::Value(true), nullptr);
a.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, a.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::nullopt,
CreateExternalDataFetcher("a")); CreateExternalDataFetcher("a"));
a.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, a.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, base::Value(false), nullptr); POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
...@@ -228,7 +228,7 @@ TEST_F(PolicyMapTest, MergeFrom) { ...@@ -228,7 +228,7 @@ TEST_F(PolicyMapTest, MergeFrom) {
b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, base::Value(false), nullptr); POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::nullopt,
CreateExternalDataFetcher("b")); CreateExternalDataFetcher("b"));
b.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, b.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_DEVICE_LOCAL_ACCOUNT_OVERRIDE, base::Value(true), POLICY_SOURCE_DEVICE_LOCAL_ACCOUNT_OVERRIDE, base::Value(true),
...@@ -265,7 +265,7 @@ TEST_F(PolicyMapTest, MergeFrom) { ...@@ -265,7 +265,7 @@ TEST_F(PolicyMapTest, MergeFrom) {
c.GetMutable(kTestPolicyName2) c.GetMutable(kTestPolicyName2)
->AddConflictingPolicy(b.Get(kTestPolicyName2)->DeepCopy()); ->AddConflictingPolicy(b.Get(kTestPolicyName2)->DeepCopy());
c.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, c.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_ENTERPRISE_DEFAULT, nullptr, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::nullopt,
CreateExternalDataFetcher("a")); CreateExternalDataFetcher("a"));
c.GetMutable(kTestPolicyName3)->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE); c.GetMutable(kTestPolicyName3)->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
c.GetMutable(kTestPolicyName3) c.GetMutable(kTestPolicyName3)
...@@ -796,11 +796,11 @@ TEST_F(PolicyMapTest, GetDifferingKeys) { ...@@ -796,11 +796,11 @@ TEST_F(PolicyMapTest, GetDifferingKeys) {
a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, base::Value("google.com"), nullptr); POLICY_SOURCE_CLOUD, base::Value("google.com"), nullptr);
a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("dummy")); POLICY_SOURCE_CLOUD, base::nullopt, CreateExternalDataFetcher("dummy"));
a.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, a.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, base::Value(true), nullptr); POLICY_SOURCE_CLOUD, base::Value(true), nullptr);
a.Set(kTestPolicyName4, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, a.Set(kTestPolicyName4, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("a")); POLICY_SOURCE_CLOUD, base::nullopt, CreateExternalDataFetcher("a"));
a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, base::Value(false), nullptr); POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
a.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE, a.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
...@@ -812,11 +812,11 @@ TEST_F(PolicyMapTest, GetDifferingKeys) { ...@@ -812,11 +812,11 @@ TEST_F(PolicyMapTest, GetDifferingKeys) {
b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, base::Value("google.com"), nullptr); POLICY_SOURCE_CLOUD, base::Value("google.com"), nullptr);
b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("dummy")); POLICY_SOURCE_CLOUD, base::nullopt, CreateExternalDataFetcher("dummy"));
b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, base::Value(false), nullptr); POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
b.Set(kTestPolicyName4, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, b.Set(kTestPolicyName4, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("b")); POLICY_SOURCE_CLOUD, base::nullopt, CreateExternalDataFetcher("b"));
b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, base::Value(false), nullptr); POLICY_SOURCE_CLOUD, base::Value(false), nullptr);
b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
......
components/policy/core/common/policy_service_impl_unittest.cc
View file @ f7640478
...@@ -58,17 +58,17 @@ void AddTestPolicies(PolicyBundle* bundle, ...@@ -58,17 +58,17 @@ void AddTestPolicies(PolicyBundle* bundle,
PolicyMap* policy_map = PolicyMap* policy_map =
&bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())); &bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
policy_map->Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy_map->Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::Value(value),
std::make_unique<base::Value>(value), nullptr); nullptr);
policy_map->Set(kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM, policy_map->Set(kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM,
std::make_unique<base::Value>(value), nullptr); base::Value(value), nullptr);
policy_map = policy_map =
&bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension)); &bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension));
policy_map->Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy_map->Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::Value(value),
std::make_unique<base::Value>(value), nullptr); nullptr);
policy_map->Set(kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM, policy_map->Set(kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM,
std::make_unique<base::Value>(value), nullptr); base::Value(value), nullptr);
} }
// Observer class that changes the policy in the passed provider when the // Observer class that changes the policy in the passed provider when the
...@@ -84,8 +84,7 @@ class ChangePolicyObserver : public PolicyService::Observer { ...@@ -84,8 +84,7 @@ class ChangePolicyObserver : public PolicyService::Observer {
const PolicyMap& current) override { const PolicyMap& current) override {
PolicyMap new_policy; PolicyMap new_policy;
new_policy.Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, new_policy.Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(14), POLICY_SOURCE_CLOUD, base::Value(14), nullptr);
nullptr);
provider_->UpdateChromePolicy(new_policy); provider_->UpdateChromePolicy(new_policy);
observer_invoked_ = true; observer_invoked_ = true;
} }
...@@ -120,8 +119,7 @@ class PolicyServiceTest : public testing::Test { ...@@ -120,8 +119,7 @@ class PolicyServiceTest : public testing::Test {
provider2_.Init(); provider2_.Init();
policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::Value(13), nullptr);
std::make_unique<base::Value>(13), nullptr);
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
PolicyServiceImpl::Providers providers; PolicyServiceImpl::Providers providers;
...@@ -133,8 +131,7 @@ class PolicyServiceTest : public testing::Test { ...@@ -133,8 +131,7 @@ class PolicyServiceTest : public testing::Test {
.WillRepeatedly(Invoke([](PolicyBundle* bundle) { .WillRepeatedly(Invoke([](PolicyBundle* bundle) {
bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15), POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
nullptr);
})); }));
PolicyServiceImpl::Migrators migrators; PolicyServiceImpl::Migrators migrators;
migrators.push_back(std::move(migrator)); migrators.push_back(std::move(migrator));
...@@ -181,11 +178,9 @@ class PolicyServiceTest : public testing::Test { ...@@ -181,11 +178,9 @@ class PolicyServiceTest : public testing::Test {
TEST_F(PolicyServiceTest, LoadsPoliciesBeforeProvidersRefresh) { TEST_F(PolicyServiceTest, LoadsPoliciesBeforeProvidersRefresh) {
PolicyMap expected; PolicyMap expected;
expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::Value(13), nullptr);
std::make_unique<base::Value>(13), nullptr);
expected.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15), POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
nullptr);
EXPECT_TRUE(VerifyPolicies( EXPECT_TRUE(VerifyPolicies(
PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected)); PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected));
} }
...@@ -196,20 +191,17 @@ TEST_F(PolicyServiceTest, NotifyObservers) { ...@@ -196,20 +191,17 @@ TEST_F(PolicyServiceTest, NotifyObservers) {
PolicyMap expectedPrevious; PolicyMap expectedPrevious;
expectedPrevious.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expectedPrevious.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::Value(13),
std::make_unique<base::Value>(13), nullptr); nullptr);
expectedPrevious.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expectedPrevious.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
std::make_unique<base::Value>(15), nullptr);
PolicyMap expectedCurrent; PolicyMap expectedCurrent;
expectedCurrent.CopyFrom(expectedPrevious); expectedCurrent.CopyFrom(expectedPrevious);
expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
nullptr);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
nullptr);
EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME, EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME,
std::string()), std::string()),
PolicyEquals(&expectedPrevious), PolicyEquals(&expectedPrevious),
...@@ -227,11 +219,9 @@ TEST_F(PolicyServiceTest, NotifyObservers) { ...@@ -227,11 +219,9 @@ TEST_F(PolicyServiceTest, NotifyObservers) {
// New policy. // New policy.
expectedPrevious.CopyFrom(expectedCurrent); expectedPrevious.CopyFrom(expectedCurrent);
expectedCurrent.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expectedCurrent.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(456), POLICY_SOURCE_CLOUD, base::Value(456), nullptr);
nullptr);
policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(456), POLICY_SOURCE_CLOUD, base::Value(456), nullptr);
nullptr);
EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME, EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME,
std::string()), std::string()),
PolicyEquals(&expectedPrevious), PolicyEquals(&expectedPrevious),
...@@ -253,11 +243,9 @@ TEST_F(PolicyServiceTest, NotifyObservers) { ...@@ -253,11 +243,9 @@ TEST_F(PolicyServiceTest, NotifyObservers) {
// Changed policy. // Changed policy.
expectedPrevious.CopyFrom(expectedCurrent); expectedPrevious.CopyFrom(expectedCurrent);
expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expectedCurrent.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(789), POLICY_SOURCE_CLOUD, base::Value(789), nullptr);
nullptr);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(789), POLICY_SOURCE_CLOUD, base::Value(789), nullptr);
nullptr);
EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME, EXPECT_CALL(observer, OnPolicyUpdated(PolicyNamespace(POLICY_DOMAIN_CHROME,
std::string()), std::string()),
...@@ -287,16 +275,14 @@ TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) { ...@@ -287,16 +275,14 @@ TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) {
PolicyMap previous_policy_map; PolicyMap previous_policy_map;
previous_policy_map.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, previous_policy_map.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::Value(13),
std::make_unique<base::Value>(13), nullptr); nullptr);
previous_policy_map.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, previous_policy_map.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
std::make_unique<base::Value>(15), nullptr);
PolicyMap policy_map; PolicyMap policy_map;
policy_map.CopyFrom(previous_policy_map); policy_map.CopyFrom(previous_policy_map);
policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>("value"), POLICY_SOURCE_CLOUD, base::Value("value"), nullptr);
nullptr);
auto bundle = std::make_unique<PolicyBundle>(); auto bundle = std::make_unique<PolicyBundle>();
// The initial setup includes a policy for chrome that is now changing. // The initial setup includes a policy for chrome that is now changing.
...@@ -335,8 +321,7 @@ TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) { ...@@ -335,8 +321,7 @@ TEST_F(PolicyServiceTest, NotifyObserversInMultipleNamespaces) {
bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.CopyFrom(policy_map); .CopyFrom(policy_map);
policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, POLICY_SOURCE_CLOUD, base::Value("another value"), nullptr);
std::make_unique<base::Value>("another value"), nullptr);
bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension1)) bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension1))
.CopyFrom(policy_map); .CopyFrom(policy_map);
bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension2)) bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension2))
...@@ -372,11 +357,9 @@ TEST_F(PolicyServiceTest, ObserverChangesPolicy) { ...@@ -372,11 +357,9 @@ TEST_F(PolicyServiceTest, ObserverChangesPolicy) {
ChangePolicyObserver observer(&provider0_); ChangePolicyObserver observer(&provider0_);
policy_service_->AddObserver(POLICY_DOMAIN_CHROME, &observer); policy_service_->AddObserver(POLICY_DOMAIN_CHROME, &observer);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
nullptr);
policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1234), POLICY_SOURCE_CLOUD, base::Value(1234), nullptr);
nullptr);
// Should not crash. // Should not crash.
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, &observer); policy_service_->RemoveObserver(POLICY_DOMAIN_CHROME, &observer);
...@@ -396,8 +379,7 @@ TEST_F(PolicyServiceTest, NotifyProviderUpdateObserver) { ...@@ -396,8 +379,7 @@ TEST_F(PolicyServiceTest, NotifyProviderUpdateObserver) {
policy_service_->AddProviderUpdateObserver(&provider_update_observer); policy_service_->AddProviderUpdateObserver(&provider_update_observer);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(123), POLICY_SOURCE_CLOUD, base::Value(123), nullptr);
nullptr);
EXPECT_CALL(provider_update_observer, EXPECT_CALL(provider_update_observer,
OnProviderUpdatePropagated(&provider0_)); OnProviderUpdatePropagated(&provider0_));
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
...@@ -415,21 +397,19 @@ TEST_F(PolicyServiceTest, NotifyProviderUpdateObserver) { ...@@ -415,21 +397,19 @@ TEST_F(PolicyServiceTest, NotifyProviderUpdateObserver) {
TEST_F(PolicyServiceTest, Priorities) { TEST_F(PolicyServiceTest, Priorities) {
PolicyMap expected; PolicyMap expected;
expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::Value(13), nullptr);
std::make_unique<base::Value>(13), nullptr);
expected.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15), POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
nullptr);
expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(0), nullptr); POLICY_SOURCE_CLOUD, base::Value(0), nullptr);
expected.GetMutable("aaa")->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE); expected.GetMutable("aaa")->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
expected.GetMutable("aaa")->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE); expected.GetMutable("aaa")->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(0), nullptr); POLICY_SOURCE_CLOUD, base::Value(0), nullptr);
policy1_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy1_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr); POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
policy2_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy2_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(2), nullptr); POLICY_SOURCE_CLOUD, base::Value(2), nullptr);
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
provider1_.UpdateChromePolicy(policy1_); provider1_.UpdateChromePolicy(policy1_);
provider2_.UpdateChromePolicy(policy2_); provider2_.UpdateChromePolicy(policy2_);
...@@ -442,7 +422,7 @@ TEST_F(PolicyServiceTest, Priorities) { ...@@ -442,7 +422,7 @@ TEST_F(PolicyServiceTest, Priorities) {
PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected)); PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected));
expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr); POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
expected.GetMutable("aaa")->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE); expected.GetMutable("aaa")->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
policy0_.Erase("aaa"); policy0_.Erase("aaa");
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
...@@ -452,10 +432,10 @@ TEST_F(PolicyServiceTest, Priorities) { ...@@ -452,10 +432,10 @@ TEST_F(PolicyServiceTest, Priorities) {
PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected)); PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()), expected));
expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(2), nullptr); POLICY_SOURCE_CLOUD, base::Value(2), nullptr);
expected.GetMutable("aaa")->AddWarning(IDS_POLICY_CONFLICT_SAME_VALUE); expected.GetMutable("aaa")->AddWarning(IDS_POLICY_CONFLICT_SAME_VALUE);
policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(1), nullptr); POLICY_SOURCE_CLOUD, base::Value(1), nullptr);
expected.GetMutable("aaa")->AddConflictingPolicy( expected.GetMutable("aaa")->AddConflictingPolicy(
policy2_.Get("aaa")->DeepCopy()); policy2_.Get("aaa")->DeepCopy());
provider1_.UpdateChromePolicy(policy2_); provider1_.UpdateChromePolicy(policy2_);
...@@ -483,14 +463,14 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) { ...@@ -483,14 +463,14 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) {
base::Value kValue0(0); base::Value kValue0(0);
EXPECT_CALL(*this, OnPolicyValueUpdated(NULL, ValueEquals(&kValue0))); EXPECT_CALL(*this, OnPolicyValueUpdated(NULL, ValueEquals(&kValue0)));
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue0.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue0.Clone(), nullptr);
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
// Changing other values doesn't trigger a notification. // Changing other values doesn't trigger a notification.
EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0); EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0);
policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue0.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue0.Clone(), nullptr);
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
...@@ -499,7 +479,7 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) { ...@@ -499,7 +479,7 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) {
EXPECT_CALL(*this, OnPolicyValueUpdated(ValueEquals(&kValue0), EXPECT_CALL(*this, OnPolicyValueUpdated(ValueEquals(&kValue0),
ValueEquals(&kValue1))); ValueEquals(&kValue1)));
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue1.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue1.Clone(), nullptr);
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
...@@ -513,10 +493,9 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) { ...@@ -513,10 +493,9 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) {
EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0); EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0);
registrar.reset(); registrar.reset();
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue1.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue1.Clone(), nullptr);
policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, kValue1.CreateDeepCopy(), POLICY_SOURCE_ENTERPRISE_DEFAULT, kValue1.Clone(), nullptr);
nullptr);
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
} }
...@@ -536,14 +515,14 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { ...@@ -536,14 +515,14 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
base::Value kValue0(0); base::Value kValue0(0);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue0.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue0.Clone(), nullptr);
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
base::Value kValue1(1); base::Value kValue1(1);
policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue1.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue1.Clone(), nullptr);
provider1_.UpdateChromePolicy(policy1_); provider1_.UpdateChromePolicy(policy1_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
...@@ -552,7 +531,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { ...@@ -552,7 +531,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
// refreshed. // refreshed.
EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
policy1_.Set("bbb", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, policy1_.Set("bbb", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue1.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue1.Clone(), nullptr);
provider1_.UpdateChromePolicy(policy1_); provider1_.UpdateChromePolicy(policy1_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
...@@ -566,7 +545,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { ...@@ -566,7 +545,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
EXPECT_CALL(*this, OnPolicyRefresh()).Times(0); EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
policy2_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy2_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue0.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue0.Clone(), nullptr);
provider2_.UpdateChromePolicy(policy2_); provider2_.UpdateChromePolicy(policy2_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
...@@ -574,7 +553,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) { ...@@ -574,7 +553,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
EXPECT_CALL(*this, OnPolicyRefresh()).Times(2); EXPECT_CALL(*this, OnPolicyRefresh()).Times(2);
base::Value kValue2(2); base::Value kValue2(2);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, kValue2.CreateDeepCopy(), nullptr); POLICY_SOURCE_CLOUD, kValue2.Clone(), nullptr);
provider0_.UpdateChromePolicy(policy0_); provider0_.UpdateChromePolicy(policy0_);
provider1_.UpdateChromePolicy(policy1_); provider1_.UpdateChromePolicy(policy1_);
Mock::VerifyAndClearExpectations(this); Mock::VerifyAndClearExpectations(this);
...@@ -601,11 +580,10 @@ TEST_F(PolicyServiceTest, NamespaceMerge) { ...@@ -601,11 +580,10 @@ TEST_F(PolicyServiceTest, NamespaceMerge) {
// For policies of the same level and scope, the first provider takes // For policies of the same level and scope, the first provider takes
// precedence, on every namespace. // precedence, on every namespace.
expected.Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected.Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT, POLICY_SOURCE_ENTERPRISE_DEFAULT, base::Value("bundle0"),
std::make_unique<base::Value>("bundle0"), nullptr);
expected.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15),
nullptr); nullptr);
expected.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
expected.GetMutable(kSameLevelPolicy) expected.GetMutable(kSameLevelPolicy)
->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE); ->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
expected.GetMutable(kSameLevelPolicy) expected.GetMutable(kSameLevelPolicy)
...@@ -623,8 +601,7 @@ TEST_F(PolicyServiceTest, NamespaceMerge) { ...@@ -623,8 +601,7 @@ TEST_F(PolicyServiceTest, NamespaceMerge) {
// For policies with different levels and scopes, the highest priority // For policies with different levels and scopes, the highest priority
// level/scope combination takes precedence, on every namespace. // level/scope combination takes precedence, on every namespace.
expected.Set(kDiffLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, expected.Set(kDiffLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>("bundle2"), POLICY_SOURCE_PLATFORM, base::Value("bundle2"), nullptr);
nullptr);
expected.GetMutable(kDiffLevelPolicy) expected.GetMutable(kDiffLevelPolicy)
->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE); ->AddWarning(IDS_POLICY_CONFLICT_DIFF_VALUE);
expected.GetMutable(kDiffLevelPolicy) expected.GetMutable(kDiffLevelPolicy)
...@@ -896,41 +873,37 @@ TEST_F(PolicyServiceTest, SeparateProxyPoliciesMerging) { ...@@ -896,41 +873,37 @@ TEST_F(PolicyServiceTest, SeparateProxyPoliciesMerging) {
// Individual proxy policy values in the Chrome namespace should be collected // Individual proxy policy values in the Chrome namespace should be collected
// into a dictionary. // into a dictionary.
policy_map.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, policy_map.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(3),
std::make_unique<base::Value>(3), nullptr); nullptr);
// Both these policies should be ignored, since there's a higher priority // Both these policies should be ignored, since there's a higher priority
// policy available. // policy available.
policy_map.Set(key::kProxyMode, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, policy_map.Set(key::kProxyMode, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, POLICY_SOURCE_CLOUD, base::Value("pac_script"), nullptr);
std::make_unique<base::Value>("pac_script"), nullptr);
policy_map.Set(key::kProxyPacUrl, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, policy_map.Set(key::kProxyPacUrl, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, POLICY_SOURCE_CLOUD,
std::make_unique<base::Value>("http://example.com/wpad.dat"), base::Value("http://example.com/wpad.dat"), nullptr);
nullptr);
// Add a value to a non-Chrome namespace. // Add a value to a non-Chrome namespace.
policy_bundle->Get(extension_namespace) policy_bundle->Get(extension_namespace)
.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, .Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, std::make_unique<base::Value>(3), nullptr); POLICY_SOURCE_CLOUD, base::Value(3), nullptr);
// The resulting Chrome namespace map should have the collected policy. // The resulting Chrome namespace map should have the collected policy.
PolicyMap expected_chrome; PolicyMap expected_chrome;
std::unique_ptr<base::DictionaryValue> expected_value( base::Value expected_value(base::Value::Type::DICTIONARY);
new base::DictionaryValue); expected_value.SetIntKey(key::kProxyServerMode, 3);
expected_value->SetInteger(key::kProxyServerMode, 3);
expected_chrome.Set(key::kProxySettings, POLICY_LEVEL_MANDATORY, expected_chrome.Set(key::kProxySettings, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
std::move(expected_value), nullptr); std::move(expected_value), nullptr);
expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15), POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
nullptr);
// The resulting Extensions namespace map shouldn't have been modified. // The resulting Extensions namespace map shouldn't have been modified.
PolicyMap expected_extension; PolicyMap expected_extension;
expected_extension.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, expected_extension.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, base::Value(3),
std::make_unique<base::Value>(3), nullptr); nullptr);
provider0_.UpdatePolicy(std::move(policy_bundle)); provider0_.UpdatePolicy(std::move(policy_bundle));
RunUntilIdle(); RunUntilIdle();
...@@ -960,8 +933,7 @@ TEST_F(PolicyServiceTest, DictionaryPoliciesMerging) { ...@@ -960,8 +933,7 @@ TEST_F(PolicyServiceTest, DictionaryPoliciesMerging) {
PolicyMap& policy_map1 = policy_bundle1->Get(chrome_namespace); PolicyMap& policy_map1 = policy_bundle1->Get(chrome_namespace);
policy_map1.Set(key::kPolicyDictionaryMultipleSourceMergeList, policy_map1.Set(key::kPolicyDictionaryMultipleSourceMergeList,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, policy->Clone(), nullptr);
base::Value::ToUniquePtrValue(policy->Clone()), nullptr);
PolicyMap::Entry entry_dict_1(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, PolicyMap::Entry entry_dict_1(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, std::move(dict1), POLICY_SOURCE_PLATFORM, std::move(dict1),
nullptr); nullptr);
...@@ -977,11 +949,9 @@ TEST_F(PolicyServiceTest, DictionaryPoliciesMerging) { ...@@ -977,11 +949,9 @@ TEST_F(PolicyServiceTest, DictionaryPoliciesMerging) {
PolicyMap expected_chrome; PolicyMap expected_chrome;
expected_chrome.Set(key::kPolicyDictionaryMultipleSourceMergeList, expected_chrome.Set(key::kPolicyDictionaryMultipleSourceMergeList,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, policy->Clone(), nullptr);
base::Value::ToUniquePtrValue(policy->Clone()), nullptr);
expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15), POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
nullptr);
PolicyMap::Entry merged(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, PolicyMap::Entry merged(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_MERGED, std::move(result), nullptr); POLICY_SOURCE_MERGED, std::move(result), nullptr);
...@@ -1018,8 +988,7 @@ TEST_F(PolicyServiceTest, ListsPoliciesMerging) { ...@@ -1018,8 +988,7 @@ TEST_F(PolicyServiceTest, ListsPoliciesMerging) {
PolicyMap& policy_map1 = policy_bundle1->Get(chrome_namespace); PolicyMap& policy_map1 = policy_bundle1->Get(chrome_namespace);
policy_map1.Set(key::kPolicyListMultipleSourceMergeList, policy_map1.Set(key::kPolicyListMultipleSourceMergeList,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, policy->Clone(), nullptr);
base::Value::ToUniquePtrValue(policy->Clone()), nullptr);
PolicyMap::Entry entry_list_1(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, PolicyMap::Entry entry_list_1(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, std::move(list1), POLICY_SOURCE_PLATFORM, std::move(list1),
nullptr); nullptr);
...@@ -1034,11 +1003,9 @@ TEST_F(PolicyServiceTest, ListsPoliciesMerging) { ...@@ -1034,11 +1003,9 @@ TEST_F(PolicyServiceTest, ListsPoliciesMerging) {
PolicyMap expected_chrome; PolicyMap expected_chrome;
expected_chrome.Set(key::kPolicyListMultipleSourceMergeList, expected_chrome.Set(key::kPolicyListMultipleSourceMergeList,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, policy->Clone(), nullptr);
base::Value::ToUniquePtrValue(policy->Clone()), nullptr);
expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15), POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
nullptr);
PolicyMap::Entry merged(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, PolicyMap::Entry merged(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_MERGED, std::move(result), nullptr); POLICY_SOURCE_MERGED, std::move(result), nullptr);
...@@ -1075,8 +1042,7 @@ TEST_F(PolicyServiceTest, GroupPoliciesMergingDisabledForCloudUsers) { ...@@ -1075,8 +1042,7 @@ TEST_F(PolicyServiceTest, GroupPoliciesMergingDisabledForCloudUsers) {
PolicyMap& policy_map1 = policy_bundle1->Get(chrome_namespace); PolicyMap& policy_map1 = policy_bundle1->Get(chrome_namespace);
policy_map1.Set(key::kPolicyListMultipleSourceMergeList, policy_map1.Set(key::kPolicyListMultipleSourceMergeList,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, policy->Clone(), nullptr);
base::Value::ToUniquePtrValue(policy->Clone()), nullptr);
PolicyMap::Entry entry_list_1(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, PolicyMap::Entry entry_list_1(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, std::move(list1), POLICY_SOURCE_PLATFORM, std::move(list1),
nullptr); nullptr);
...@@ -1101,11 +1067,9 @@ TEST_F(PolicyServiceTest, GroupPoliciesMergingDisabledForCloudUsers) { ...@@ -1101,11 +1067,9 @@ TEST_F(PolicyServiceTest, GroupPoliciesMergingDisabledForCloudUsers) {
PolicyMap expected_chrome; PolicyMap expected_chrome;
expected_chrome.Set(key::kPolicyListMultipleSourceMergeList, expected_chrome.Set(key::kPolicyListMultipleSourceMergeList,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, policy->Clone(), nullptr);
base::Value::ToUniquePtrValue(policy->Clone()), nullptr);
expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15), POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
nullptr);
PolicyMap::Entry merged(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, PolicyMap::Entry merged(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_MERGED, std::move(result), nullptr); POLICY_SOURCE_MERGED, std::move(result), nullptr);
...@@ -1146,8 +1110,7 @@ TEST_F(PolicyServiceTest, GroupPoliciesMergingEnabled) { ...@@ -1146,8 +1110,7 @@ TEST_F(PolicyServiceTest, GroupPoliciesMergingEnabled) {
PolicyMap& policy_map1 = policy_bundle1->Get(chrome_namespace); PolicyMap& policy_map1 = policy_bundle1->Get(chrome_namespace);
policy_map1.Set(key::kPolicyListMultipleSourceMergeList, policy_map1.Set(key::kPolicyListMultipleSourceMergeList,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, policy->Clone(), nullptr);
base::Value::ToUniquePtrValue(policy->Clone()), nullptr);
PolicyMap::Entry entry_list_1(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, PolicyMap::Entry entry_list_1(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, std::move(list1), POLICY_SOURCE_PLATFORM, std::move(list1),
nullptr); nullptr);
...@@ -1172,11 +1135,9 @@ TEST_F(PolicyServiceTest, GroupPoliciesMergingEnabled) { ...@@ -1172,11 +1135,9 @@ TEST_F(PolicyServiceTest, GroupPoliciesMergingEnabled) {
PolicyMap expected_chrome; PolicyMap expected_chrome;
expected_chrome.Set(key::kPolicyListMultipleSourceMergeList, expected_chrome.Set(key::kPolicyListMultipleSourceMergeList,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, POLICY_SOURCE_PLATFORM, policy->Clone(), nullptr);
base::Value::ToUniquePtrValue(policy->Clone()), nullptr);
expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, expected_chrome.Set("migrated", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM, std::make_unique<base::Value>(15), POLICY_SOURCE_PLATFORM, base::Value(15), nullptr);
nullptr);
PolicyMap::Entry merged(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, PolicyMap::Entry merged(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_MERGED, std::move(result), nullptr); POLICY_SOURCE_MERGED, std::move(result), nullptr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment