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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Increased ID range for Messages. Created 5 years, 3 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
« chrome/browser/chromeos/policy/login_profile_policy_provider.cc ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/resources/policy.html » ('j') | chrome/browser/ui/webui/policy_ui.cc » ('J')
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 946f11934e0ecba20ac01f5a41bb0a5897767c34..de656c01165b8eb2c4c0073ebb9ca54c4d606a0f 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -144,67 +144,80 @@ 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,
- new base::StringValue("primary-only"),
- NULL);
- policy_map->Set(key::kEasyUnlockAllowed,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- new base::FundamentalValue(false),
- NULL);
- policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- new base::FundamentalValue(false),
- NULL);
+ policy_map->SetWithSource(key::kChromeOsMultiProfileUserBehavior,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::StringValue("primary-only"),
+ NULL,
+ POLICY_SOURCE_ENTERPRISE_DEFAULT);
+ policy_map->SetWithSource(key::kEasyUnlockAllowed,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::FundamentalValue(false),
+ NULL,
+ POLICY_SOURCE_ENTERPRISE_DEFAULT);
+ policy_map->SetWithSource(key::kCaptivePortalAuthenticationIgnoresProxy,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::FundamentalValue(false),
+ NULL,
+ POLICY_SOURCE_ENTERPRISE_DEFAULT);
#endif
}
void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
- expected->Set(key::kShowHomeButton,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- new base::FundamentalValue(true),
- NULL);
- expected->Set(key::kRestoreOnStartup,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- new base::FundamentalValue(4),
- NULL);
+ expected->SetWithSource(key::kShowHomeButton,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::FundamentalValue(true),
+ NULL,
+ POLICY_SOURCE_CLOUD);
+ expected->SetWithSource(key::kRestoreOnStartup,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::FundamentalValue(4),
+ NULL,
+ POLICY_SOURCE_CLOUD);
base::ListValue list;
list.AppendString("dev.chromium.org");
list.AppendString("youtube.com");
- expected->Set(
- key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- list.DeepCopy(), NULL);
- expected->Set(key::kMaxInvalidationFetchDelay,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- new base::FundamentalValue(1000),
- NULL);
- expected->Set(key::kHomepageLocation,
- POLICY_LEVEL_RECOMMENDED,
- POLICY_SCOPE_USER,
- new base::StringValue(homepage),
- NULL);
+ expected->SetWithSource(key::kURLBlacklist,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ list.DeepCopy(),
+ NULL,
+ POLICY_SOURCE_CLOUD);
+ expected->SetWithSource(key::kMaxInvalidationFetchDelay,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::FundamentalValue(1000),
+ NULL,
+ POLICY_SOURCE_CLOUD);
+ expected->SetWithSource(key::kHomepageLocation,
+ POLICY_LEVEL_RECOMMENDED,
+ POLICY_SCOPE_USER,
+ new base::StringValue(homepage),
+ NULL,
+ POLICY_SOURCE_CLOUD);
#if defined(OS_CHROMEOS)
- expected->Set(key::kChromeOsMultiProfileUserBehavior,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- new base::StringValue("primary-only"),
- NULL);
- expected->Set(key::kEasyUnlockAllowed,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- new base::FundamentalValue(false),
- NULL);
- expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- new base::FundamentalValue(false),
- NULL);
+ expected->SetWithSource(key::kChromeOsMultiProfileUserBehavior,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::StringValue("primary-only"),
+ NULL,
+ POLICY_SOURCE_ENTERPRISE_DEFAULT);
+ expected->SetWithSource(key::kEasyUnlockAllowed,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::FundamentalValue(false),
+ NULL,
+ POLICY_SOURCE_ENTERPRISE_DEFAULT);
+ expected->SetWithSource(key::kCaptivePortalAuthenticationIgnoresProxy,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::FundamentalValue(false),
+ NULL,
+ POLICY_SOURCE_ENTERPRISE_DEFAULT);
#endif
}
« chrome/browser/chromeos/policy/login_profile_policy_provider.cc ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/resources/policy.html » ('j') | chrome/browser/ui/webui/policy_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698