Index: components/policy/core/common/policy_loader_win_unittest.cc |
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc |
index c0afc4ecf33f6cd65ab662ff7c43f073bd434d35..9236ba2805024f303b24758f1569018ffe122f82 100644 |
--- a/components/policy/core/common/policy_loader_win_unittest.cc |
+++ b/components/policy/core/common/policy_loader_win_unittest.cc |
@@ -333,7 +333,9 @@ void ScopedGroupPolicyRegistrySandbox::DeleteKeys() { |
} |
RegistryTestHarness::RegistryTestHarness(HKEY hive, PolicyScope scope) |
- : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, scope), hive_(hive) {} |
+ : PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, scope, |
+ POLICY_SOURCE_PLATFORM), |
+ hive_(hive) {} |
RegistryTestHarness::~RegistryTestHarness() {} |
@@ -759,6 +761,8 @@ class PolicyLoaderWinTest : public PolicyTestBase, |
PolicyBundle expected; |
expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) |
.LoadFrom(&expected_policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); |
+ expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) |
+ .ApplySourceToEntries(POLICY_SOURCE_PLATFORM); |
return Matches(expected); |
} |
@@ -775,6 +779,8 @@ class PolicyLoaderWinTest : public PolicyTestBase, |
expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) |
.LoadFrom(&expected_policy, POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_MACHINE); |
+ expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) |
+ .ApplySourceToEntries(POLICY_SOURCE_PLATFORM); |
return Matches(expected); |
} |
@@ -800,11 +806,12 @@ TEST_F(PolicyLoaderWinTest, HKLMOverHKCU) { |
PolicyBundle expected; |
expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) |
- .Set(test_keys::kKeyString, |
- POLICY_LEVEL_MANDATORY, |
- POLICY_SCOPE_MACHINE, |
- new base::StringValue("hklm"), |
- NULL); |
+ .SetWithSource(test_keys::kKeyString, |
+ POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_MACHINE, |
+ new base::StringValue("hklm"), |
+ NULL, |
+ POLICY_SOURCE_PLATFORM); |
EXPECT_TRUE(Matches(expected)); |
} |
@@ -854,26 +861,30 @@ TEST_F(PolicyLoaderWinTest, Merge3rdPartyPolicies) { |
PolicyBundle expected; |
PolicyMap& expected_policy = expected.Get(ns); |
- expected_policy.Set("a", |
- POLICY_LEVEL_MANDATORY, |
- POLICY_SCOPE_MACHINE, |
- new base::StringValue(kMachineMandatory), |
- NULL); |
- expected_policy.Set("b", |
- POLICY_LEVEL_MANDATORY, |
- POLICY_SCOPE_USER, |
- new base::StringValue(kUserMandatory), |
- NULL); |
- expected_policy.Set("c", |
- POLICY_LEVEL_RECOMMENDED, |
- POLICY_SCOPE_MACHINE, |
- new base::StringValue(kMachineRecommended), |
- NULL); |
- expected_policy.Set("d", |
- POLICY_LEVEL_RECOMMENDED, |
- POLICY_SCOPE_USER, |
- new base::StringValue(kUserRecommended), |
- NULL); |
+ expected_policy.SetWithSource("a", |
+ POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_MACHINE, |
+ new base::StringValue(kMachineMandatory), |
+ NULL, |
+ POLICY_SOURCE_PLATFORM); |
+ expected_policy.SetWithSource("b", |
+ POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_USER, |
+ new base::StringValue(kUserMandatory), |
+ NULL, |
+ POLICY_SOURCE_PLATFORM); |
+ expected_policy.SetWithSource("c", |
+ POLICY_LEVEL_RECOMMENDED, |
+ POLICY_SCOPE_MACHINE, |
+ new base::StringValue(kMachineRecommended), |
+ NULL, |
+ POLICY_SOURCE_PLATFORM); |
+ expected_policy.SetWithSource("d", |
+ POLICY_LEVEL_RECOMMENDED, |
+ POLICY_SCOPE_USER, |
+ new base::StringValue(kUserRecommended), |
+ NULL, |
+ POLICY_SOURCE_PLATFORM); |
EXPECT_TRUE(Matches(expected)); |
} |
@@ -931,6 +942,7 @@ TEST_F(PolicyLoaderWinTest, LoadStringEncodedValues) { |
PolicyBundle expected; |
expected.Get(ns).LoadFrom(&policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); |
+ expected.Get(ns).ApplySourceToEntries(POLICY_SOURCE_PLATFORM); |
EXPECT_TRUE(Matches(expected)); |
} |
@@ -963,6 +975,7 @@ TEST_F(PolicyLoaderWinTest, LoadIntegerEncodedValues) { |
policy.SetDouble("double", 456.0); |
PolicyBundle expected; |
expected.Get(ns).LoadFrom(&policy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); |
+ expected.Get(ns).ApplySourceToEntries(POLICY_SOURCE_PLATFORM); |
EXPECT_TRUE(Matches(expected)); |
} |
@@ -1014,6 +1027,7 @@ TEST_F(PolicyLoaderWinTest, DefaultPropertySchemaType) { |
PolicyBundle expected; |
expected.Get(ns).LoadFrom( |
&expected_policies, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER); |
+ expected.Get(ns).ApplySourceToEntries(POLICY_SOURCE_PLATFORM); |
EXPECT_TRUE(Matches(expected)); |
} |
@@ -1180,10 +1194,12 @@ TEST_F(PolicyLoaderWinTest, LoadExtensionPolicyAlternativeSpelling) { |
expected_a.SetInteger("policy 2", 3); |
expected.Get(ns_a).LoadFrom( |
&expected_a, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE); |
+ expected.Get(ns_a).ApplySourceToEntries(POLICY_SOURCE_PLATFORM); |
base::DictionaryValue expected_b; |
expected_b.SetInteger("policy 1", 2); |
expected.Get(ns_b).LoadFrom( |
&expected_b, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE); |
+ expected.Get(ns_b).ApplySourceToEntries(POLICY_SOURCE_PLATFORM); |
EXPECT_TRUE(Matches(expected)); |
} |
@@ -1222,6 +1238,7 @@ TEST_F(PolicyLoaderWinTest, LBSSupport) { |
new base::StringValue("c:\\legacy\\browser.exe"), NULL); |
expected_policy.Set("url_list", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, |
list.DeepCopy(), NULL); |
+ expected.Get(ns).ApplySourceToEntries(POLICY_SOURCE_PLATFORM); |
EXPECT_TRUE(Matches(expected)); |
} |