| Index: chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
|
| diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
|
| index fd7559d47d15cf027ca95f5ca2d939ac5c9210b8..7cdf66742741f72b8fedb6c3a2e9a83d29870d48 100644
|
| --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
|
| +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
|
| @@ -65,37 +65,37 @@ TEST_F(ScreenMagnifierPolicyHandlerTest, Default) {
|
| TEST_F(ScreenMagnifierPolicyHandlerTest, Disabled) {
|
| policy_.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(0), nullptr);
|
| + base::MakeUnique<base::Value>(0), nullptr);
|
| handler_.ApplyPolicySettings(policy_, &prefs_);
|
|
|
| const base::Value* enabled = NULL;
|
| EXPECT_TRUE(
|
| prefs_.GetValue(prefs::kAccessibilityScreenMagnifierEnabled, &enabled));
|
| ASSERT_TRUE(enabled);
|
| - EXPECT_TRUE(base::FundamentalValue(false).Equals(enabled));
|
| + EXPECT_TRUE(base::Value(false).Equals(enabled));
|
|
|
| const base::Value* type = NULL;
|
| EXPECT_TRUE(prefs_.GetValue(prefs::kAccessibilityScreenMagnifierType, &type));
|
| ASSERT_TRUE(type);
|
| - EXPECT_TRUE(base::FundamentalValue(0).Equals(type));
|
| + EXPECT_TRUE(base::Value(0).Equals(type));
|
| }
|
|
|
| TEST_F(ScreenMagnifierPolicyHandlerTest, Enabled) {
|
| policy_.Set(key::kScreenMagnifierType, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(1), nullptr);
|
| + base::MakeUnique<base::Value>(1), nullptr);
|
| handler_.ApplyPolicySettings(policy_, &prefs_);
|
|
|
| const base::Value* enabled = NULL;
|
| EXPECT_TRUE(
|
| prefs_.GetValue(prefs::kAccessibilityScreenMagnifierEnabled, &enabled));
|
| ASSERT_TRUE(enabled);
|
| - EXPECT_TRUE(base::FundamentalValue(true).Equals(enabled));
|
| + EXPECT_TRUE(base::Value(true).Equals(enabled));
|
|
|
| const base::Value* type = NULL;
|
| EXPECT_TRUE(prefs_.GetValue(prefs::kAccessibilityScreenMagnifierType, &type));
|
| ASSERT_TRUE(type);
|
| - EXPECT_TRUE(base::FundamentalValue(1).Equals(type));
|
| + EXPECT_TRUE(base::Value(1).Equals(type));
|
| }
|
|
|
| TEST(ExternalDataPolicyHandlerTest, Empty) {
|
| @@ -109,7 +109,7 @@ TEST(ExternalDataPolicyHandlerTest, WrongType) {
|
| PolicyMap policy_map;
|
| policy_map.Set(key::kUserAvatarImage, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| PolicyErrorMap errors;
|
| EXPECT_FALSE(ExternalDataPolicyHandler(key::kUserAvatarImage)
|
| .CheckPolicySettings(policy_map, &errors));
|
| @@ -249,7 +249,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, WrongType) {
|
| PolicyMap policy_map;
|
| policy_map.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| std::unique_ptr<NetworkConfigurationPolicyHandler> handler(
|
| NetworkConfigurationPolicyHandler::CreateForUserPolicy());
|
| PolicyErrorMap errors;
|
| @@ -355,7 +355,7 @@ TEST_F(LoginScreenPowerManagementPolicyHandlerTest, WrongType) {
|
| PolicyMap policy_map;
|
| policy_map.Set(key::kDeviceLoginScreenPowerManagement, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| LoginScreenPowerManagementPolicyHandler handler(chrome_schema_);
|
| PolicyErrorMap errors;
|
| EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
|
|
|