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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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, |
144 POLICY_LEVEL_MANDATORY, | 144 POLICY_LEVEL_MANDATORY, |
145 POLICY_SCOPE_USER, | 145 POLICY_SCOPE_USER, |
146 new base::FundamentalValue(true), | 146 new base::FundamentalValue(true), |
147 NULL); | 147 NULL); |
148 | |
bartfab (slow)
2015/09/14 14:42:25
Nit: Why remove the line?
fhorschig
2015/09/16 13:52:04
Done.
| |
149 device_local_account_policy_.payload().mutable_disablespdy()->set_value( | 148 device_local_account_policy_.payload().mutable_disablespdy()->set_value( |
150 true); | 149 true); |
151 device_local_account_policy_.policy_data().set_policy_type( | 150 device_local_account_policy_.policy_data().set_policy_type( |
152 dm_protocol::kChromePublicAccountPolicyType); | 151 dm_protocol::kChromePublicAccountPolicyType); |
153 } | 152 } |
154 | 153 |
155 void DeviceLocalAccountPolicyServiceTestBase::TearDown() { | 154 void DeviceLocalAccountPolicyServiceTestBase::TearDown() { |
156 service_->Shutdown(); | 155 service_->Shutdown(); |
157 service_.reset(); | 156 service_.reset(); |
158 extension_cache_task_runner_->RunUntilIdle(); | 157 extension_cache_task_runner_->RunUntilIdle(); |
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
795 GenerateDeviceLocalAccountUserId(kAccount1, | 794 GenerateDeviceLocalAccountUserId(kAccount1, |
796 DeviceLocalAccount::TYPE_PUBLIC_SESSION), | 795 DeviceLocalAccount::TYPE_PUBLIC_SESSION), |
797 service_.get()); | 796 service_.get()); |
798 } | 797 } |
799 | 798 |
800 void DeviceLocalAccountPolicyProviderTest::SetUp() { | 799 void DeviceLocalAccountPolicyProviderTest::SetUp() { |
801 DeviceLocalAccountPolicyServiceTestBase::SetUp(); | 800 DeviceLocalAccountPolicyServiceTestBase::SetUp(); |
802 provider_->Init(&schema_registry_); | 801 provider_->Init(&schema_registry_); |
803 provider_->AddObserver(&provider_observer_); | 802 provider_->AddObserver(&provider_observer_); |
804 | 803 |
804 expected_policy_map_.SetWithSource(key::kDisableSpdy, | |
805 POLICY_LEVEL_MANDATORY, | |
806 POLICY_SCOPE_USER, | |
807 new base::FundamentalValue(true), | |
808 NULL, | |
bartfab (slow)
2015/09/14 14:42:25
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:03
Done.
| |
809 POLICY_SOURCE_CLOUD); | |
bartfab (slow)
2015/09/14 14:42:25
Nit: #include "components/policy/core/common/polic
fhorschig
2015/09/16 13:52:03
Done.
| |
810 | |
805 // Values implicitly enforced for public accounts. | 811 // Values implicitly enforced for public accounts. |
806 expected_policy_map_.Set(key::kLidCloseAction, | 812 expected_policy_map_.SetWithSource(key::kLidCloseAction, |
807 POLICY_LEVEL_MANDATORY, | 813 POLICY_LEVEL_MANDATORY, |
808 POLICY_SCOPE_MACHINE, | 814 POLICY_SCOPE_MACHINE, |
809 new base::FundamentalValue( | 815 new base::FundamentalValue( |
810 chromeos::PowerPolicyController:: | 816 chromeos::PowerPolicyController:: |
811 ACTION_STOP_SESSION), | 817 ACTION_STOP_SESSION), |
812 NULL); | 818 NULL, |
bartfab (slow)
2015/09/14 14:42:25
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:03
Done.
| |
813 expected_policy_map_.Set(key::kShelfAutoHideBehavior, | 819 POLICY_SOURCE_PROGRAMMATIC); |
814 POLICY_LEVEL_MANDATORY, | 820 expected_policy_map_.SetWithSource(key::kShelfAutoHideBehavior, |
815 POLICY_SCOPE_MACHINE, | 821 POLICY_LEVEL_MANDATORY, |
816 new base::StringValue("Never"), | 822 POLICY_SCOPE_MACHINE, |
817 NULL); | 823 new base::StringValue("Never"), |
818 expected_policy_map_.Set(key::kShowLogoutButtonInTray, | 824 NULL, |
bartfab (slow)
2015/09/14 14:42:25
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:03
Done.
| |
819 POLICY_LEVEL_MANDATORY, | 825 POLICY_SOURCE_PROGRAMMATIC); |
820 POLICY_SCOPE_MACHINE, | 826 expected_policy_map_.SetWithSource(key::kShowLogoutButtonInTray, |
821 new base::FundamentalValue(true), | 827 POLICY_LEVEL_MANDATORY, |
822 NULL); | 828 POLICY_SCOPE_MACHINE, |
823 expected_policy_map_.Set(key::kFullscreenAllowed, | 829 new base::FundamentalValue(true), |
824 POLICY_LEVEL_MANDATORY, | 830 NULL, |
bartfab (slow)
2015/09/14 14:42:25
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
825 POLICY_SCOPE_MACHINE, | 831 POLICY_SOURCE_PROGRAMMATIC); |
826 new base::FundamentalValue(false), | 832 expected_policy_map_.SetWithSource(key::kFullscreenAllowed, |
827 NULL); | 833 POLICY_LEVEL_MANDATORY, |
834 POLICY_SCOPE_MACHINE, | |
835 new base::FundamentalValue(false), | |
836 NULL, | |
bartfab (slow)
2015/09/14 14:42:25
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:03
Done.
| |
837 POLICY_SOURCE_PROGRAMMATIC); | |
828 } | 838 } |
829 | 839 |
830 void DeviceLocalAccountPolicyProviderTest::TearDown() { | 840 void DeviceLocalAccountPolicyProviderTest::TearDown() { |
831 provider_->RemoveObserver(&provider_observer_); | 841 provider_->RemoveObserver(&provider_observer_); |
832 provider_->Shutdown(); | 842 provider_->Shutdown(); |
833 provider_.reset(); | 843 provider_.reset(); |
834 DeviceLocalAccountPolicyServiceTestBase::TearDown(); | 844 DeviceLocalAccountPolicyServiceTestBase::TearDown(); |
835 } | 845 } |
836 | 846 |
837 TEST_F(DeviceLocalAccountPolicyProviderTest, Initialization) { | 847 TEST_F(DeviceLocalAccountPolicyProviderTest, Initialization) { |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
879 InstallDeviceLocalAccountPolicy(kAccount1); | 889 InstallDeviceLocalAccountPolicy(kAccount1); |
880 DeviceLocalAccountPolicyBroker* broker = | 890 DeviceLocalAccountPolicyBroker* broker = |
881 service_->GetBrokerForUser(account_1_user_id_); | 891 service_->GetBrokerForUser(account_1_user_id_); |
882 ASSERT_TRUE(broker); | 892 ASSERT_TRUE(broker); |
883 broker->core()->store()->Load(); | 893 broker->core()->store()->Load(); |
884 FlushDeviceSettings(); | 894 FlushDeviceSettings(); |
885 Mock::VerifyAndClearExpectations(&provider_observer_); | 895 Mock::VerifyAndClearExpectations(&provider_observer_); |
886 | 896 |
887 expected_policy_bundle.Get( | 897 expected_policy_bundle.Get( |
888 PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) | 898 PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) |
889 .Set(key::kDisableSpdy, | 899 .SetWithSource(key::kDisableSpdy, |
890 POLICY_LEVEL_MANDATORY, | 900 POLICY_LEVEL_MANDATORY, |
891 POLICY_SCOPE_USER, | 901 POLICY_SCOPE_USER, |
892 new base::FundamentalValue(false), | 902 new base::FundamentalValue(false), |
893 NULL); | 903 NULL, |
bartfab (slow)
2015/09/14 14:42:25
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:03
Done.
| |
904 POLICY_SOURCE_CLOUD); | |
894 EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies())); | 905 EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies())); |
895 | 906 |
896 // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray| | 907 // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray| |
897 // and |ExtensionAllowedTypes| policies should be overridden. | 908 // and |ExtensionAllowedTypes| policies should be overridden. |
898 EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get())) | 909 EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get())) |
899 .Times(AtLeast(1)); | 910 .Times(AtLeast(1)); |
900 device_local_account_policy_.payload().mutable_shelfautohidebehavior()-> | 911 device_local_account_policy_.payload().mutable_shelfautohidebehavior()-> |
901 set_value("Always"); | 912 set_value("Always"); |
902 device_local_account_policy_.payload().mutable_showlogoutbuttonintray()-> | 913 device_local_account_policy_.payload().mutable_showlogoutbuttonintray()-> |
903 set_value(false); | 914 set_value(false); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
972 em::DeviceManagementResponse response; | 983 em::DeviceManagementResponse response; |
973 device_local_account_policy_.Build(); | 984 device_local_account_policy_.Build(); |
974 response.mutable_policy_response()->add_response()->CopyFrom( | 985 response.mutable_policy_response()->add_response()->CopyFrom( |
975 device_local_account_policy_.policy()); | 986 device_local_account_policy_.policy()); |
976 request_job->SendResponse(DM_STATUS_SUCCESS, response); | 987 request_job->SendResponse(DM_STATUS_SUCCESS, response); |
977 FlushDeviceSettings(); | 988 FlushDeviceSettings(); |
978 Mock::VerifyAndClearExpectations(&provider_observer_); | 989 Mock::VerifyAndClearExpectations(&provider_observer_); |
979 } | 990 } |
980 | 991 |
981 } // namespace policy | 992 } // namespace policy |
OLD | NEW |