Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" | 5 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 account_2_user_id_(GenerateDeviceLocalAccountUserId( | 133 account_2_user_id_(GenerateDeviceLocalAccountUserId( |
| 134 kAccount2, | 134 kAccount2, |
| 135 DeviceLocalAccount::TYPE_PUBLIC_SESSION)), | 135 DeviceLocalAccount::TYPE_PUBLIC_SESSION)), |
| 136 cros_settings_(&device_settings_service_), | 136 cros_settings_(&device_settings_service_), |
| 137 extension_cache_task_runner_(new base::TestSimpleTaskRunner) { | 137 extension_cache_task_runner_(new base::TestSimpleTaskRunner) { |
| 138 } | 138 } |
| 139 | 139 |
| 140 void DeviceLocalAccountPolicyServiceTestBase::SetUp() { | 140 void DeviceLocalAccountPolicyServiceTestBase::SetUp() { |
| 141 chromeos::DeviceSettingsTestBase::SetUp(); | 141 chromeos::DeviceSettingsTestBase::SetUp(); |
| 142 | 142 |
| 143 expected_policy_map_.Set(key::kDisableSpdy, | 143 expected_policy_map_.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, |
| 144 POLICY_LEVEL_MANDATORY, | 144 POLICY_SCOPE_USER, new base::FundamentalValue(true), |
| 145 POLICY_SCOPE_USER, | 145 NULL, POLICY_SOURCE_PLATFORM); |
| 146 new base::FundamentalValue(true), | |
| 147 NULL); | |
| 148 | 146 |
| 149 device_local_account_policy_.payload().mutable_disablespdy()->set_value( | 147 device_local_account_policy_.payload().mutable_disablespdy()->set_value( |
| 150 true); | 148 true); |
| 151 device_local_account_policy_.policy_data().set_policy_type( | 149 device_local_account_policy_.policy_data().set_policy_type( |
| 152 dm_protocol::kChromePublicAccountPolicyType); | 150 dm_protocol::kChromePublicAccountPolicyType); |
| 153 } | 151 } |
| 154 | 152 |
| 155 void DeviceLocalAccountPolicyServiceTestBase::TearDown() { | 153 void DeviceLocalAccountPolicyServiceTestBase::TearDown() { |
| 156 service_->Shutdown(); | 154 service_->Shutdown(); |
| 157 service_.reset(); | 155 service_.reset(); |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob()); | 190 device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob()); |
| 193 ReloadDeviceSettings(); | 191 ReloadDeviceSettings(); |
| 194 } | 192 } |
| 195 | 193 |
| 196 DeviceLocalAccountPolicyServiceTest::DeviceLocalAccountPolicyServiceTest() { | 194 DeviceLocalAccountPolicyServiceTest::DeviceLocalAccountPolicyServiceTest() { |
| 197 CreatePolicyService(); | 195 CreatePolicyService(); |
| 198 } | 196 } |
| 199 | 197 |
| 200 void DeviceLocalAccountPolicyServiceTest::SetUp() { | 198 void DeviceLocalAccountPolicyServiceTest::SetUp() { |
| 201 DeviceLocalAccountPolicyServiceTestBase::SetUp(); | 199 DeviceLocalAccountPolicyServiceTestBase::SetUp(); |
| 200 expected_policy_map_.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, | |
| 201 POLICY_SCOPE_USER, new base::FundamentalValue(true), | |
| 202 NULL, | |
| 203 POLICY_SOURCE_DEFAULT); // No source from broker. | |
| 202 service_->AddObserver(&service_observer_); | 204 service_->AddObserver(&service_observer_); |
| 203 } | 205 } |
| 204 | 206 |
| 205 void DeviceLocalAccountPolicyServiceTest::TearDown() { | 207 void DeviceLocalAccountPolicyServiceTest::TearDown() { |
| 206 service_->RemoveObserver(&service_observer_); | 208 service_->RemoveObserver(&service_observer_); |
| 207 DeviceLocalAccountPolicyServiceTestBase::TearDown(); | 209 DeviceLocalAccountPolicyServiceTestBase::TearDown(); |
| 208 } | 210 } |
| 209 | 211 |
| 210 void DeviceLocalAccountPolicyServiceTest::InstallDevicePolicy() { | 212 void DeviceLocalAccountPolicyServiceTest::InstallDevicePolicy() { |
| 211 EXPECT_CALL(service_observer_, OnDeviceLocalAccountsChanged()); | 213 EXPECT_CALL(service_observer_, OnDeviceLocalAccountsChanged()); |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 796 DeviceLocalAccount::TYPE_PUBLIC_SESSION), | 798 DeviceLocalAccount::TYPE_PUBLIC_SESSION), |
| 797 service_.get()); | 799 service_.get()); |
| 798 } | 800 } |
| 799 | 801 |
| 800 void DeviceLocalAccountPolicyProviderTest::SetUp() { | 802 void DeviceLocalAccountPolicyProviderTest::SetUp() { |
| 801 DeviceLocalAccountPolicyServiceTestBase::SetUp(); | 803 DeviceLocalAccountPolicyServiceTestBase::SetUp(); |
| 802 provider_->Init(&schema_registry_); | 804 provider_->Init(&schema_registry_); |
| 803 provider_->AddObserver(&provider_observer_); | 805 provider_->AddObserver(&provider_observer_); |
| 804 | 806 |
| 805 // Values implicitly enforced for public accounts. | 807 // Values implicitly enforced for public accounts. |
| 806 expected_policy_map_.Set(key::kLidCloseAction, | 808 expected_policy_map_.Set( |
|
Thiemo Nagel
2015/09/01 17:40:36
Please don't reformat existing code.
fhorschig
2015/09/04 06:53:53
Done.
| |
| 807 POLICY_LEVEL_MANDATORY, | 809 key::kLidCloseAction, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, |
| 810 new base::FundamentalValue( | |
| 811 chromeos::PowerPolicyController::ACTION_STOP_SESSION), | |
| 812 NULL, POLICY_SOURCE_PLATFORM); | |
| 813 expected_policy_map_.Set(key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY, | |
| 814 POLICY_SCOPE_MACHINE, new base::StringValue("Never"), | |
| 815 NULL, POLICY_SOURCE_PLATFORM); | |
| 816 expected_policy_map_.Set(key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY, | |
| 808 POLICY_SCOPE_MACHINE, | 817 POLICY_SCOPE_MACHINE, |
| 809 new base::FundamentalValue( | 818 new base::FundamentalValue(true), NULL, |
| 810 chromeos::PowerPolicyController:: | 819 POLICY_SOURCE_PLATFORM); |
| 811 ACTION_STOP_SESSION), | 820 expected_policy_map_.Set( |
| 812 NULL); | 821 key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, |
| 813 expected_policy_map_.Set(key::kShelfAutoHideBehavior, | 822 new base::FundamentalValue(false), NULL, POLICY_SOURCE_PLATFORM); |
| 814 POLICY_LEVEL_MANDATORY, | |
| 815 POLICY_SCOPE_MACHINE, | |
| 816 new base::StringValue("Never"), | |
| 817 NULL); | |
| 818 expected_policy_map_.Set(key::kShowLogoutButtonInTray, | |
| 819 POLICY_LEVEL_MANDATORY, | |
| 820 POLICY_SCOPE_MACHINE, | |
| 821 new base::FundamentalValue(true), | |
| 822 NULL); | |
| 823 expected_policy_map_.Set(key::kFullscreenAllowed, | |
| 824 POLICY_LEVEL_MANDATORY, | |
| 825 POLICY_SCOPE_MACHINE, | |
| 826 new base::FundamentalValue(false), | |
| 827 NULL); | |
| 828 } | 823 } |
| 829 | 824 |
| 830 void DeviceLocalAccountPolicyProviderTest::TearDown() { | 825 void DeviceLocalAccountPolicyProviderTest::TearDown() { |
| 831 provider_->RemoveObserver(&provider_observer_); | 826 provider_->RemoveObserver(&provider_observer_); |
| 832 provider_->Shutdown(); | 827 provider_->Shutdown(); |
| 833 provider_.reset(); | 828 provider_.reset(); |
| 834 DeviceLocalAccountPolicyServiceTestBase::TearDown(); | 829 DeviceLocalAccountPolicyServiceTestBase::TearDown(); |
| 835 } | 830 } |
| 836 | 831 |
| 837 TEST_F(DeviceLocalAccountPolicyProviderTest, Initialization) { | 832 TEST_F(DeviceLocalAccountPolicyProviderTest, Initialization) { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 877 device_local_account_policy_.payload().mutable_disablespdy()->set_value( | 872 device_local_account_policy_.payload().mutable_disablespdy()->set_value( |
| 878 false); | 873 false); |
| 879 InstallDeviceLocalAccountPolicy(kAccount1); | 874 InstallDeviceLocalAccountPolicy(kAccount1); |
| 880 DeviceLocalAccountPolicyBroker* broker = | 875 DeviceLocalAccountPolicyBroker* broker = |
| 881 service_->GetBrokerForUser(account_1_user_id_); | 876 service_->GetBrokerForUser(account_1_user_id_); |
| 882 ASSERT_TRUE(broker); | 877 ASSERT_TRUE(broker); |
| 883 broker->core()->store()->Load(); | 878 broker->core()->store()->Load(); |
| 884 FlushDeviceSettings(); | 879 FlushDeviceSettings(); |
| 885 Mock::VerifyAndClearExpectations(&provider_observer_); | 880 Mock::VerifyAndClearExpectations(&provider_observer_); |
| 886 | 881 |
| 887 expected_policy_bundle.Get( | 882 expected_policy_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, |
| 888 PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) | 883 std::string())) |
| 889 .Set(key::kDisableSpdy, | 884 .Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
| 890 POLICY_LEVEL_MANDATORY, | 885 new base::FundamentalValue(false), NULL, POLICY_SOURCE_PLATFORM); |
| 891 POLICY_SCOPE_USER, | |
| 892 new base::FundamentalValue(false), | |
| 893 NULL); | |
| 894 EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies())); | 886 EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies())); |
| 895 | 887 |
| 896 // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray| | 888 // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray| |
| 897 // and |ExtensionAllowedTypes| policies should be overridden. | 889 // and |ExtensionAllowedTypes| policies should be overridden. |
| 898 EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get())) | 890 EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get())) |
| 899 .Times(AtLeast(1)); | 891 .Times(AtLeast(1)); |
| 900 device_local_account_policy_.payload().mutable_shelfautohidebehavior()-> | 892 device_local_account_policy_.payload().mutable_shelfautohidebehavior()-> |
| 901 set_value("Always"); | 893 set_value("Always"); |
| 902 device_local_account_policy_.payload().mutable_showlogoutbuttonintray()-> | 894 device_local_account_policy_.payload().mutable_showlogoutbuttonintray()-> |
| 903 set_value(false); | 895 set_value(false); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 972 em::DeviceManagementResponse response; | 964 em::DeviceManagementResponse response; |
| 973 device_local_account_policy_.Build(); | 965 device_local_account_policy_.Build(); |
| 974 response.mutable_policy_response()->add_response()->CopyFrom( | 966 response.mutable_policy_response()->add_response()->CopyFrom( |
| 975 device_local_account_policy_.policy()); | 967 device_local_account_policy_.policy()); |
| 976 request_job->SendResponse(DM_STATUS_SUCCESS, response); | 968 request_job->SendResponse(DM_STATUS_SUCCESS, response); |
| 977 FlushDeviceSettings(); | 969 FlushDeviceSettings(); |
| 978 Mock::VerifyAndClearExpectations(&provider_observer_); | 970 Mock::VerifyAndClearExpectations(&provider_observer_); |
| 979 } | 971 } |
| 980 | 972 |
| 981 } // namespace policy | 973 } // namespace policy |
| OLD | NEW |