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

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

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 9 months 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 // Policy defaults (for policies not set by admin). 827 // Policy defaults (for policies not set by admin).
829 SetEnterpriseUsersDefaults(&expected_policy_map_); 828 SetEnterpriseUsersDefaults(&expected_policy_map_);
830 } 829 }
831 830
832 void DeviceLocalAccountPolicyProviderTest::TearDown() { 831 void DeviceLocalAccountPolicyProviderTest::TearDown() {
833 provider_->RemoveObserver(&provider_observer_); 832 provider_->RemoveObserver(&provider_observer_);
834 provider_->Shutdown(); 833 provider_->Shutdown();
835 provider_.reset(); 834 provider_.reset();
836 DeviceLocalAccountPolicyServiceTestBase::TearDown(); 835 DeviceLocalAccountPolicyServiceTestBase::TearDown();
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 service_->GetBrokerForUser(account_1_user_id_); 893 service_->GetBrokerForUser(account_1_user_id_);
895 ASSERT_TRUE(broker); 894 ASSERT_TRUE(broker);
896 broker->core()->store()->Load(); 895 broker->core()->store()->Load();
897 FlushDeviceSettings(); 896 FlushDeviceSettings();
898 Mock::VerifyAndClearExpectations(&provider_observer_); 897 Mock::VerifyAndClearExpectations(&provider_observer_);
899 898
900 expected_policy_bundle 899 expected_policy_bundle
901 .Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) 900 .Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
902 .Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY, 901 .Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
903 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 902 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
904 base::MakeUnique<base::FundamentalValue>(false), nullptr); 903 base::MakeUnique<base::Value>(false), nullptr);
905 EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies())); 904 EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies()));
906 905
907 // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray| 906 // Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray|
908 // and |ExtensionAllowedTypes| policies should be overridden. 907 // and |ExtensionAllowedTypes| policies should be overridden.
909 EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get())) 908 EXPECT_CALL(provider_observer_, OnUpdatePolicy(provider_.get()))
910 .Times(AtLeast(1)); 909 .Times(AtLeast(1));
911 device_local_account_policy_.payload().mutable_shelfautohidebehavior()-> 910 device_local_account_policy_.payload().mutable_shelfautohidebehavior()->
912 set_value("Always"); 911 set_value("Always");
913 device_local_account_policy_.payload().mutable_showlogoutbuttonintray()-> 912 device_local_account_policy_.payload().mutable_showlogoutbuttonintray()->
914 set_value(false); 913 set_value(false);
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 1030
1032 provider_ = DeviceLocalAccountPolicyProvider::Create( 1031 provider_ = DeviceLocalAccountPolicyProvider::Create(
1033 GenerateDeviceLocalAccountUserId(kAccount1, 1032 GenerateDeviceLocalAccountUserId(kAccount1,
1034 DeviceLocalAccount::TYPE_PUBLIC_SESSION), 1033 DeviceLocalAccount::TYPE_PUBLIC_SESSION),
1035 service_.get(), true /*force_immediate_load*/); 1034 service_.get(), true /*force_immediate_load*/);
1036 1035
1037 EXPECT_TRUE(provider_->IsInitializationComplete(POLICY_DOMAIN_CHROME)); 1036 EXPECT_TRUE(provider_->IsInitializationComplete(POLICY_DOMAIN_CHROME));
1038 } 1037 }
1039 1038
1040 } // namespace policy 1039 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698