Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
138 DeviceLocalAccount::TYPE_PUBLIC_SESSION)), 138 DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
139 cros_settings_(&device_settings_service_), 139 cros_settings_(&device_settings_service_),
140 extension_cache_task_runner_(new base::TestSimpleTaskRunner) { 140 extension_cache_task_runner_(new base::TestSimpleTaskRunner) {
141 } 141 }
142 142
143 void DeviceLocalAccountPolicyServiceTestBase::SetUp() { 143 void DeviceLocalAccountPolicyServiceTestBase::SetUp() {
144 chromeos::DeviceSettingsTestBase::SetUp(); 144 chromeos::DeviceSettingsTestBase::SetUp();
145 145
146 expected_policy_map_.Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY, 146 expected_policy_map_.Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
147 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 147 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
148 base::MakeUnique<base::FundamentalValue>(true), 148 base::MakeUnique<base::Value>(true), nullptr);
149 nullptr);
150 149
151 device_local_account_policy_.payload() 150 device_local_account_policy_.payload()
152 .mutable_searchsuggestenabled() 151 .mutable_searchsuggestenabled()
153 ->set_value(true); 152 ->set_value(true);
154 device_local_account_policy_.policy_data().set_policy_type( 153 device_local_account_policy_.policy_data().set_policy_type(
155 dm_protocol::kChromePublicAccountPolicyType); 154 dm_protocol::kChromePublicAccountPolicyType);
156 } 155 }
157 156
158 void DeviceLocalAccountPolicyServiceTestBase::TearDown() { 157 void DeviceLocalAccountPolicyServiceTestBase::TearDown() {
159 service_->Shutdown(); 158 service_->Shutdown();
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 801
803 void DeviceLocalAccountPolicyProviderTest::SetUp() { 802 void DeviceLocalAccountPolicyProviderTest::SetUp() {
804 DeviceLocalAccountPolicyServiceTestBase::SetUp(); 803 DeviceLocalAccountPolicyServiceTestBase::SetUp();
805 provider_->Init(&schema_registry_); 804 provider_->Init(&schema_registry_);
806 provider_->AddObserver(&provider_observer_); 805 provider_->AddObserver(&provider_observer_);
807 806
808 // Values implicitly enforced for public accounts. 807 // Values implicitly enforced for public accounts.
809 expected_policy_map_.Set( 808 expected_policy_map_.Set(
810 key::kLidCloseAction, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, 809 key::kLidCloseAction, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
811 POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE, 810 POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
812 base::MakeUnique<base::FundamentalValue>( 811 base::MakeUnique<base::Value>(
813 chromeos::PowerPolicyController::ACTION_STOP_SESSION), 812 chromeos::PowerPolicyController::ACTION_STOP_SESSION),
814 nullptr); 813 nullptr);
815 expected_policy_map_.Set( 814 expected_policy_map_.Set(
816 key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, 815 key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
817 POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE, 816 POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
818 base::MakeUnique<base::StringValue>("Never"), nullptr); 817 base::MakeUnique<base::StringValue>("Never"), nullptr);
819 expected_policy_map_.Set( 818 expected_policy_map_.Set(key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY,
820 key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY, 819 POLICY_SCOPE_MACHINE,
821 POLICY_SCOPE_MACHINE, POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE, 820 POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
822 base::MakeUnique<base::FundamentalValue>(true), nullptr); 821 base::MakeUnique<base::Value>(true), nullptr);
823 expected_policy_map_.Set( 822 expected_policy_map_.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY,
824 key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, 823 POLICY_SCOPE_MACHINE,
825 POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE, 824 POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
826 base::MakeUnique<base::FundamentalValue>(false), nullptr); 825 base::MakeUnique<base::Value>(false), nullptr);
827 } 826 }
828 827
829 void DeviceLocalAccountPolicyProviderTest::TearDown() { 828 void DeviceLocalAccountPolicyProviderTest::TearDown() {
830 provider_->RemoveObserver(&provider_observer_); 829 provider_->RemoveObserver(&provider_observer_);
831 provider_->Shutdown(); 830 provider_->Shutdown();
832 provider_.reset(); 831 provider_.reset();
833 DeviceLocalAccountPolicyServiceTestBase::TearDown(); 832 DeviceLocalAccountPolicyServiceTestBase::TearDown();
834 } 833 }
835 834
836 TEST_F(DeviceLocalAccountPolicyProviderTest, Initialization) { 835 TEST_F(DeviceLocalAccountPolicyProviderTest, Initialization) {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 service_->GetBrokerForUser(account_1_user_id_); 880 service_->GetBrokerForUser(account_1_user_id_);
882 ASSERT_TRUE(broker); 881 ASSERT_TRUE(broker);
883 broker->core()->store()->Load(); 882 broker->core()->store()->Load();
884 FlushDeviceSettings(); 883 FlushDeviceSettings();
885 Mock::VerifyAndClearExpectations(&provider_observer_); 884 Mock::VerifyAndClearExpectations(&provider_observer_);
886 885
887 expected_policy_bundle 886 expected_policy_bundle
888 .Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) 887 .Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
889 .Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY, 888 .Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
890 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 889 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
891 base::MakeUnique<base::FundamentalValue>(false), nullptr); 890 base::MakeUnique<base::Value>(false), nullptr);
892 EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies())); 891 EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies()));
893 892
894 // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray| 893 // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray|
895 // and |ExtensionAllowedTypes| policies should be overridden. 894 // and |ExtensionAllowedTypes| policies should be overridden.
896 EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get())) 895 EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get()))
897 .Times(AtLeast(1)); 896 .Times(AtLeast(1));
898 device_local_account_policy_.payload().mutable_shelfautohidebehavior()-> 897 device_local_account_policy_.payload().mutable_shelfautohidebehavior()->
899 set_value("Always"); 898 set_value("Always");
900 device_local_account_policy_.payload().mutable_showlogoutbuttonintray()-> 899 device_local_account_policy_.payload().mutable_showlogoutbuttonintray()->
901 set_value(false); 900 set_value(false);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 em::DeviceManagementResponse response; 969 em::DeviceManagementResponse response;
971 device_local_account_policy_.Build(); 970 device_local_account_policy_.Build();
972 response.mutable_policy_response()->add_response()->CopyFrom( 971 response.mutable_policy_response()->add_response()->CopyFrom(
973 device_local_account_policy_.policy()); 972 device_local_account_policy_.policy());
974 request_job->SendResponse(DM_STATUS_SUCCESS, response); 973 request_job->SendResponse(DM_STATUS_SUCCESS, response);
975 FlushDeviceSettings(); 974 FlushDeviceSettings();
976 Mock::VerifyAndClearExpectations(&provider_observer_); 975 Mock::VerifyAndClearExpectations(&provider_observer_);
977 } 976 }
978 977
979 } // namespace policy 978 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698