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

Unified Diff: chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
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 c82ef6cbf14005fb12e540d089c38fea2b28a250..176871333d13cd15be49ae8b67c2a55bcc902d06 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,8 +145,7 @@ void DeviceLocalAccountPolicyServiceTestBase::SetUp() {
expected_policy_map_.Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(true),
- nullptr);
+ base::MakeUnique<base::Value>(true), nullptr);
device_local_account_policy_.payload()
.mutable_searchsuggestenabled()
@@ -809,21 +808,21 @@ void DeviceLocalAccountPolicyProviderTest::SetUp() {
expected_policy_map_.Set(
key::kLidCloseAction, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
- base::MakeUnique<base::FundamentalValue>(
+ base::MakeUnique<base::Value>(
chromeos::PowerPolicyController::ACTION_STOP_SESSION),
nullptr);
expected_policy_map_.Set(
key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
base::MakeUnique<base::StringValue>("Never"), nullptr);
- expected_policy_map_.Set(
- key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE, POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
- base::MakeUnique<base::FundamentalValue>(true), nullptr);
- expected_policy_map_.Set(
- key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ expected_policy_map_.Set(key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
+ base::MakeUnique<base::Value>(true), nullptr);
+ expected_policy_map_.Set(key::kFullscreenAllowed, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
+ base::MakeUnique<base::Value>(false), nullptr);
// Policy defaults (for policies not set by admin).
SetEnterpriseUsersDefaults(&expected_policy_map_);
@@ -901,7 +900,7 @@ TEST_F(DeviceLocalAccountPolicyProviderTest, Policy) {
.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set(key::kSearchSuggestEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::FundamentalValue>(false), nullptr);
+ base::MakeUnique<base::Value>(false), nullptr);
EXPECT_TRUE(expected_policy_bundle.Equals(provider_->policies()));
// Any values set for the |ShelfAutoHideBehavior|, |ShowLogoutButtonInTray|

Powered by Google App Engine
This is Rietveld 408576698