| 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 f33c85045d0cef102c05f2fc266c89b81c1b6313..58934065ac0af478d7ce0f4183a5d85c1c7fecf5 100644
|
| --- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
|
| +++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
|
| @@ -222,7 +222,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, ValidONC) {
|
| policy_map.Set(key::kOpenNetworkConfiguration,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| - Value::CreateStringValue(kTestONC),
|
| + base::Value::CreateStringValue(kTestONC),
|
| NULL);
|
| scoped_ptr<NetworkConfigurationPolicyHandler> handler(
|
| NetworkConfigurationPolicyHandler::CreateForUserPolicy());
|
| @@ -236,7 +236,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, WrongType) {
|
| policy_map.Set(key::kOpenNetworkConfiguration,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| - Value::CreateBooleanValue(false),
|
| + base::Value::CreateBooleanValue(false),
|
| NULL);
|
| scoped_ptr<NetworkConfigurationPolicyHandler> handler(
|
| NetworkConfigurationPolicyHandler::CreateForUserPolicy());
|
| @@ -251,7 +251,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, JSONParseError) {
|
| policy_map.Set(key::kOpenNetworkConfiguration,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| - Value::CreateStringValue(kTestONC),
|
| + base::Value::CreateStringValue(kTestONC),
|
| NULL);
|
| scoped_ptr<NetworkConfigurationPolicyHandler> handler(
|
| NetworkConfigurationPolicyHandler::CreateForUserPolicy());
|
| @@ -279,13 +279,14 @@ TEST(NetworkConfigurationPolicyHandlerTest, Sanitization) {
|
| policy_map.Set(key::kOpenNetworkConfiguration,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| - Value::CreateStringValue(kTestONC),
|
| + base::Value::CreateStringValue(kTestONC),
|
| NULL);
|
| scoped_ptr<NetworkConfigurationPolicyHandler> handler(
|
| NetworkConfigurationPolicyHandler::CreateForUserPolicy());
|
| PolicyErrorMap errors;
|
| handler->PrepareForDisplaying(&policy_map);
|
| - const Value* sanitized = policy_map.GetValue(key::kOpenNetworkConfiguration);
|
| + const base::Value* sanitized =
|
| + policy_map.GetValue(key::kOpenNetworkConfiguration);
|
| ASSERT_TRUE(sanitized);
|
| std::string sanitized_onc;
|
| EXPECT_TRUE(sanitized->GetAsString(&sanitized_onc));
|
| @@ -330,11 +331,12 @@ TEST(LoginScreenPowerManagementPolicyHandlerTest, Empty) {
|
|
|
| TEST(LoginScreenPowerManagementPolicyHandlerTest, ValidPolicy) {
|
| PolicyMap policy_map;
|
| - policy_map.Set(key::kDeviceLoginScreenPowerManagement,
|
| - POLICY_LEVEL_MANDATORY,
|
| - POLICY_SCOPE_USER,
|
| - Value::CreateStringValue(kLoginScreenPowerManagementPolicy),
|
| - NULL);
|
| + policy_map.Set(
|
| + key::kDeviceLoginScreenPowerManagement,
|
| + POLICY_LEVEL_MANDATORY,
|
| + POLICY_SCOPE_USER,
|
| + base::Value::CreateStringValue(kLoginScreenPowerManagementPolicy),
|
| + NULL);
|
| LoginScreenPowerManagementPolicyHandler handler;
|
| PolicyErrorMap errors;
|
| EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
|
| @@ -346,7 +348,7 @@ TEST(LoginScreenPowerManagementPolicyHandlerTest, WrongType) {
|
| policy_map.Set(key::kDeviceLoginScreenPowerManagement,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| - Value::CreateBooleanValue(false),
|
| + base::Value::CreateBooleanValue(false),
|
| NULL);
|
| LoginScreenPowerManagementPolicyHandler handler;
|
| PolicyErrorMap errors;
|
| @@ -361,7 +363,7 @@ TEST(LoginScreenPowerManagementPolicyHandlerTest, JSONParseError) {
|
| policy_map.Set(key::kDeviceLoginScreenPowerManagement,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| - Value::CreateStringValue(policy),
|
| + base::Value::CreateStringValue(policy),
|
| NULL);
|
| LoginScreenPowerManagementPolicyHandler handler;
|
| PolicyErrorMap errors;
|
|
|