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

chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 122 matching lines @@
       account_2_user_id_(GenerateDeviceLocalAccountUserId(
           kAccount2,
           DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
       cros_settings_(&device_settings_service_),
       extension_cache_task_runner_(new base::TestSimpleTaskRunner) {
 }
 
 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);
   device_local_account_policy_.policy_data().set_policy_type(
       dm_protocol::kChromePublicAccountPolicyType);
 }
 
 void DeviceLocalAccountPolicyServiceTestBase::TearDown() {
   service_->Shutdown();
   service_.reset();
@@ skipping 34 matching lines @@
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
   ReloadDeviceSettings();
 }
 
 DeviceLocalAccountPolicyServiceTest::DeviceLocalAccountPolicyServiceTest() {
   CreatePolicyService();
 }
 
 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_);
 }
 
 void DeviceLocalAccountPolicyServiceTest::TearDown() {
   service_->RemoveObserver(&service_observer_);
   DeviceLocalAccountPolicyServiceTestBase::TearDown();
 }
 
 void DeviceLocalAccountPolicyServiceTest::InstallDevicePolicy() {
   EXPECT_CALL(service_observer_, OnDeviceLocalAccountsChanged());
@@ skipping 584 matching lines @@
                                        DeviceLocalAccount::TYPE_PUBLIC_SESSION),
       service_.get());
 }
 
 void DeviceLocalAccountPolicyProviderTest::SetUp() {
   DeviceLocalAccountPolicyServiceTestBase::SetUp();
   provider_->Init(&schema_registry_);
   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() {
   provider_->RemoveObserver(&provider_observer_);
   provider_->Shutdown();
   provider_.reset();
   DeviceLocalAccountPolicyServiceTestBase::TearDown();
 }
 
 TEST_F(DeviceLocalAccountPolicyProviderTest, Initialization) {
@@ skipping 39 matching lines @@
   device_local_account_policy_.payload().mutable_disablespdy()->set_value(
       false);
   InstallDeviceLocalAccountPolicy(kAccount1);
   DeviceLocalAccountPolicyBroker* broker =
       service_->GetBrokerForUser(account_1_user_id_);
   ASSERT_TRUE(broker);
   broker->core()->store()->Load();
   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|
   // and |ExtensionAllowedTypes| policies should be overridden.
   EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get()))
       .Times(AtLeast(1));
   device_local_account_policy_.payload().mutable_shelfautohidebehavior()->
       set_value("Always");
   device_local_account_policy_.payload().mutable_showlogoutbuttonintray()->
       set_value(false);
@@ skipping 68 matching lines @@
   em::DeviceManagementResponse response;
   device_local_account_policy_.Build();
   response.mutable_policy_response()->add_response()->CopyFrom(
       device_local_account_policy_.policy());
   request_job->SendResponse(DM_STATUS_SUCCESS, response);
   FlushDeviceSettings();
   Mock::VerifyAndClearExpectations(&provider_observer_);
 }
 
 }  // namespace policy