Commit 8a792dcd authored by atwilson's avatar atwilson Committed by Commit bot

Revert "Set default multi-profile policy to not-allowed."

No longer need this change on trunk now that it has been tested and
merged to M37 branch.

This reverts commit fd85a93b.

BUG=405983
TBR=bartfab@chromium.org

Review URL: https://codereview.chromium.org/499923002

Cr-Commit-Position: refs/heads/master@{#291625}
parent 70cdd67c
......@@ -280,13 +280,13 @@ void UserCloudPolicyManagerChromeOS::OnComponentCloudPolicyUpdated() {
void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) {
CloudPolicyManager::GetChromePolicy(policy_map);
// Default multi-profile behavior for managed accounts to not-allowed.
// Default multi-profile behavior for managed accounts to primary-only.
if (store()->has_policy() &&
!policy_map->Get(key::kChromeOsMultiProfileUserBehavior)) {
policy_map->Set(key::kChromeOsMultiProfileUserBehavior,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
new base::StringValue("not-allowed"),
new base::StringValue("primary-only"),
NULL);
}
}
......
......@@ -113,7 +113,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
NULL);
policy_map_.Set(key::kChromeOsMultiProfileUserBehavior,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
new base::StringValue("not-allowed"),
new base::StringValue("primary-only"),
NULL);
expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.CopyFrom(policy_map_);
......
......@@ -140,7 +140,7 @@ void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
policy_map->Set(key::kChromeOsMultiProfileUserBehavior,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
new base::StringValue("not-allowed"),
new base::StringValue("primary-only"),
NULL);
#endif
}
......@@ -176,7 +176,7 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
expected->Set(key::kChromeOsMultiProfileUserBehavior,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
new base::StringValue("not-allowed"),
new base::StringValue("primary-only"),
NULL);
#endif
}
......
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