| 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..de8fa813780f45ae301dd1d38bcd6ab88abca339 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
|
| @@ -145,7 +145,6 @@ void DeviceLocalAccountPolicyServiceTestBase::SetUp() {
|
| POLICY_SCOPE_USER,
|
| new base::FundamentalValue(true),
|
| NULL);
|
| -
|
| device_local_account_policy_.payload().mutable_disablespdy()->set_value(
|
| true);
|
| device_local_account_policy_.policy_data().set_policy_type(
|
| @@ -802,29 +801,40 @@ void DeviceLocalAccountPolicyProviderTest::SetUp() {
|
| provider_->Init(&schema_registry_);
|
| provider_->AddObserver(&provider_observer_);
|
|
|
| + expected_policy_map_.SetWithSource(key::kDisableSpdy,
|
| + POLICY_LEVEL_MANDATORY,
|
| + POLICY_SCOPE_USER,
|
| + new base::FundamentalValue(true),
|
| + NULL,
|
| + POLICY_SOURCE_CLOUD);
|
| +
|
| // 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_PROGRAMMATIC);
|
| + expected_policy_map_.SetWithSource(key::kShelfAutoHideBehavior,
|
| + POLICY_LEVEL_MANDATORY,
|
| + POLICY_SCOPE_MACHINE,
|
| + new base::StringValue("Never"),
|
| + NULL,
|
| + POLICY_SOURCE_PROGRAMMATIC);
|
| + expected_policy_map_.SetWithSource(key::kShowLogoutButtonInTray,
|
| + POLICY_LEVEL_MANDATORY,
|
| + POLICY_SCOPE_MACHINE,
|
| + new base::FundamentalValue(true),
|
| + NULL,
|
| + POLICY_SOURCE_PROGRAMMATIC);
|
| + expected_policy_map_.SetWithSource(key::kFullscreenAllowed,
|
| + POLICY_LEVEL_MANDATORY,
|
| + POLICY_SCOPE_MACHINE,
|
| + new base::FundamentalValue(false),
|
| + NULL,
|
| + POLICY_SOURCE_PROGRAMMATIC);
|
| }
|
|
|
| void DeviceLocalAccountPolicyProviderTest::TearDown() {
|
| @@ -886,11 +896,12 @@ TEST_F(DeviceLocalAccountPolicyProviderTest, Policy) {
|
|
|
| expected_policy_bundle.Get(
|
| PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
|
| - .Set(key::kDisableSpdy,
|
| - POLICY_LEVEL_MANDATORY,
|
| - POLICY_SCOPE_USER,
|
| - new base::FundamentalValue(false),
|
| - NULL);
|
| + .SetWithSource(key::kDisableSpdy,
|
| + 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|
|
|
|