Commit e49750c2 authored by Owen Min's avatar Owen Min Committed by Commit Bot

Make PolicyLoaderMac set policy map at machine scope.

Platform policy should be in the machine level as it applies to all profiles.

Change-Id: Idc5bab84d31cb577299c689ca27e75a68e87441b
Reviewed-on: https://chromium-review.googlesource.com/1188892Reviewed-by: default avatarJulian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586255}
parent 83b8d009
......@@ -87,7 +87,7 @@ std::unique_ptr<PolicyBundle> PolicyLoaderMac::Load() {
// TODO(joaodasilva): figure the policy scope.
std::unique_ptr<base::Value> policy = PropertyToValue(value);
if (policy) {
chrome_policy.Set(it.key(), level, POLICY_SCOPE_USER,
chrome_policy.Set(it.key(), level, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM, std::move(policy), nullptr);
} else {
status.Add(POLICY_LOAD_STATUS_PARSE_ERROR);
......@@ -181,7 +181,7 @@ void PolicyLoaderMac::LoadPolicyForComponent(
forced ? POLICY_LEVEL_MANDATORY : POLICY_LEVEL_RECOMMENDED;
std::unique_ptr<base::Value> policy_value = PropertyToValue(value);
if (policy_value) {
policy->Set(it.key(), level, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM,
policy->Set(it.key(), level, POLICY_SCOPE_MACHINE, POLICY_SOURCE_PLATFORM,
std::move(policy_value), nullptr);
}
}
......
......@@ -66,7 +66,8 @@ class TestHarness : public PolicyProviderTestHarness {
};
TestHarness::TestHarness()
: PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
: PolicyProviderTestHarness(POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM) {}
TestHarness::~TestHarness() {}
......@@ -197,8 +198,8 @@ TEST_F(PolicyLoaderMacTest, TestNonForcedValue) {
scoped_task_environment_.RunUntilIdle();
PolicyBundle expected_bundle;
expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set(test_keys::kKeyString, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
POLICY_SOURCE_PLATFORM,
.Set(test_keys::kKeyString, POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_MACHINE, POLICY_SOURCE_PLATFORM,
std::make_unique<base::Value>("string value"), nullptr);
EXPECT_TRUE(provider_->policies().Equals(expected_bundle));
}
......
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