Add source column to chrome://policy showing the origins of policies.

chrome/browser/policy/cloud/cloud_policy_browsertest.cc

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..ff2d3c274f33c21f4f6687953f792fde37cbfe69 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -145,66 +145,47 @@ 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_LEVEL_MANDATORY, POLICY_SCOPE_USER,

[Thiemo Nagel, 2015/09/01 17:40:36]

Don't reformat!

[fhorschig, 2015/09/04 06:53:53]

Done.

+                  new base::StringValue("primary-only"), NULL,
+                  POLICY_SOURCE_ENTERPRISE_DEFAULT);
+  policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
+                  POLICY_SCOPE_USER, new base::FundamentalValue(false), NULL,
+                  POLICY_SOURCE_ENTERPRISE_DEFAULT);
   policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
-                  POLICY_LEVEL_MANDATORY,
-                  POLICY_SCOPE_USER,
-                  new base::FundamentalValue(false),
-                  NULL);
+                  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->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+                new base::FundamentalValue(true), NULL, POLICY_SOURCE_CLOUD);
+  expected->Set(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->Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+                list.DeepCopy(), NULL, POLICY_SOURCE_CLOUD);
+  expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY,
+                POLICY_SCOPE_USER, new base::FundamentalValue(1000), NULL,
+                POLICY_SOURCE_CLOUD);
+  expected->Set(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::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
+                POLICY_SCOPE_USER, new base::StringValue("primary-only"), NULL,
+                POLICY_SOURCE_ENTERPRISE_DEFAULT);
+  expected->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
+                POLICY_SCOPE_USER, new base::FundamentalValue(false), NULL,
+                POLICY_SOURCE_ENTERPRISE_DEFAULT);
   expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
-                POLICY_LEVEL_MANDATORY,
-                POLICY_SCOPE_USER,
-                new base::FundamentalValue(false),
-                NULL);
+                POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+                new base::FundamentalValue(false), NULL,
+                POLICY_SOURCE_ENTERPRISE_DEFAULT);
 #endif
 }