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

chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

Index: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
index 53649bf65acb0984c0828ce3106727fd38a3bad2..dfb8e0b860799d5449cbf442d9ff6701c2b5e37d 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
@@ -140,11 +140,12 @@ DeviceLocalAccountPolicyServiceTestBase::
 void DeviceLocalAccountPolicyServiceTestBase::SetUp() {
   chromeos::DeviceSettingsTestBase::SetUp();
 
-  expected_policy_map_.Set(key::kDisableSpdy,
-                           POLICY_LEVEL_MANDATORY,
-                           POLICY_SCOPE_USER,
-                           new base::FundamentalValue(true),
-                           NULL);
+  expected_policy_map_.SetWithSource(key::kDisableSpdy,
+                                     POLICY_LEVEL_MANDATORY,
+                                     POLICY_SCOPE_USER,
+                                     new base::FundamentalValue(true),
+                                     NULL,
+                                     POLICY_SOURCE_CLOUD);
 
   device_local_account_policy_.payload().mutable_disablespdy()->set_value(
       true);
@@ -199,6 +200,11 @@ DeviceLocalAccountPolicyServiceTest::DeviceLocalAccountPolicyServiceTest() {
 
 void DeviceLocalAccountPolicyServiceTest::SetUp() {
   DeviceLocalAccountPolicyServiceTestBase::SetUp();
+  expected_policy_map_.Set(key::kDisableSpdy,

[Thiemo Nagel, 2015/09/04 20:15:53]

This seems obsolete.

[fhorschig, 2015/09/07 14:09:33]

Done.

+                           POLICY_LEVEL_MANDATORY,
+                           POLICY_SCOPE_USER,
+                           new base::FundamentalValue(true),
+                           NULL);
   service_->AddObserver(&service_observer_);
 }
 
@@ -803,28 +809,32 @@ void DeviceLocalAccountPolicyProviderTest::SetUp() {
   provider_->AddObserver(&provider_observer_);
 
   // Values implicitly enforced for public accounts.
-  expected_policy_map_.Set(key::kLidCloseAction,
-                           POLICY_LEVEL_MANDATORY,
-                           POLICY_SCOPE_MACHINE,
-                           new base::FundamentalValue(
-                               chromeos::PowerPolicyController::
-                                   ACTION_STOP_SESSION),
-                           NULL);
-  expected_policy_map_.Set(key::kShelfAutoHideBehavior,
-                           POLICY_LEVEL_MANDATORY,
-                           POLICY_SCOPE_MACHINE,
-                           new base::StringValue("Never"),
-                           NULL);
-  expected_policy_map_.Set(key::kShowLogoutButtonInTray,
-                           POLICY_LEVEL_MANDATORY,
-                           POLICY_SCOPE_MACHINE,
-                           new base::FundamentalValue(true),
-                           NULL);
-  expected_policy_map_.Set(key::kFullscreenAllowed,
-                           POLICY_LEVEL_MANDATORY,
-                           POLICY_SCOPE_MACHINE,
-                           new base::FundamentalValue(false),
-                           NULL);
+  expected_policy_map_.SetWithSource(key::kLidCloseAction,
+                                     POLICY_LEVEL_MANDATORY,
+                                     POLICY_SCOPE_MACHINE,
+                                     new base::FundamentalValue(
+                                         chromeos::PowerPolicyController::
+                                             ACTION_STOP_SESSION),
+                                     NULL,
+                                     POLICY_SOURCE_ENFORCED);
+  expected_policy_map_.SetWithSource(key::kShelfAutoHideBehavior,
+                                     POLICY_LEVEL_MANDATORY,
+                                     POLICY_SCOPE_MACHINE,
+                                     new base::StringValue("Never"),
+                                     NULL,
+                                     POLICY_SOURCE_ENFORCED);
+  expected_policy_map_.SetWithSource(key::kShowLogoutButtonInTray,
+                                     POLICY_LEVEL_MANDATORY,
+                                     POLICY_SCOPE_MACHINE,
+                                     new base::FundamentalValue(true),
+                                     NULL,
+                                     POLICY_SOURCE_ENFORCED);
+  expected_policy_map_.SetWithSource(key::kFullscreenAllowed,
+                                     POLICY_LEVEL_MANDATORY,
+                                     POLICY_SCOPE_MACHINE,
+                                     new base::FundamentalValue(false),
+                                     NULL,
+                                     POLICY_SOURCE_ENFORCED);
 }
 
 void DeviceLocalAccountPolicyProviderTest::TearDown() {
@@ -884,13 +894,14 @@ TEST_F(DeviceLocalAccountPolicyProviderTest, Policy) {
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&provider_observer_);
 
-  expected_policy_bundle.Get(
-      PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
-      .Set(key::kDisableSpdy,
-           POLICY_LEVEL_MANDATORY,
-           POLICY_SCOPE_USER,
-           new base::FundamentalValue(false),
-           NULL);
+  expected_policy_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME,
+                                             std::string()))

[Thiemo Nagel, 2015/09/04 20:15:53]

Please restore the formatting of this line.

[fhorschig, 2015/09/07 14:09:33]

Done.

+      .SetWithSource(key::kDisableSpdy,

[Thiemo Nagel, 2015/09/04 20:15:53]

Please indent this and the following lines by 4 characters.

[fhorschig, 2015/09/07 14:09:33]

Done.

+                     POLICY_LEVEL_MANDATORY,
+                     POLICY_SCOPE_USER,
+                     new base::FundamentalValue(false),
+                     NULL,
+                     POLICY_SOURCE_CLOUD);
   EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies()));
 
   // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray|