Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3149)

Unified Diff: chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Issue 2275963004: Apply default policy values also on non-ChromeOS
Patch Set: move down into UserCloudPolicyManager[ChromeOS] Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/policy/core/common/cloud/user_cloud_policy_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/cloud/cloud_policy_browsertest.cc
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index fa47b2b9a30be4c026a1359dffc12f813f6119a2..e0aed3568b888e0ad027b593964e7c068a6d4852 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -149,7 +149,6 @@ std::string GetTestPolicy(const char* homepage, int key_version) {
}
void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
-#if defined(OS_CHROMEOS)
policy_map->Set(
key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
@@ -170,7 +169,6 @@ void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
policy_map->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
base::WrapUnique(new base::FundamentalValue(false)), nullptr);
-#endif
}
void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
@@ -191,7 +189,7 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
base::WrapUnique(new base::StringValue(homepage)), nullptr);
-#if defined(OS_CHROMEOS)
+
expected->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
base::WrapUnique(new base::StringValue("primary-only")),
@@ -212,7 +210,6 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
expected->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
base::WrapUnique(new base::FundamentalValue(false)), nullptr);
-#endif
}
} // namespace
« no previous file with comments | « no previous file | components/policy/core/common/cloud/user_cloud_policy_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698