chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc - Issue 8804020: Set onc_source UI data parameter when importing ONC.

Unified Diff: chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc

Issue 8804020: Set onc_source UI data parameter when importing ONC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 9 years 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

« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_chromeos.cc ('k') | chrome/browser/policy/configuration_policy_handler_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc

diff --git a/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc

index 882a1057bd3b756da6cd5cad45daee141a3dafde..7cc1f8a4d837df768703f556187423e524f90eb2 100644

--- a/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc

+++ b/chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc

@@ -12,7 +12,9 @@ namespace policy {

TEST(NetworkConfigurationPolicyHandlerTest, Empty) {

PolicyMap policy_map;

- NetworkConfigurationPolicyHandler handler(kPolicyOpenNetworkConfiguration);

+ NetworkConfigurationPolicyHandler handler(

+ kPolicyOpenNetworkConfiguration,

+ chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));

EXPECT_TRUE(errors.GetErrors(kPolicyOpenNetworkConfiguration).empty());

@@ -35,7 +37,9 @@ TEST(NetworkConfigurationPolicyHandlerTest, ValidONC) {

PolicyMap policy_map;

policy_map.Set(kPolicyOpenNetworkConfiguration,

Value::CreateStringValue(kTestONC));

- NetworkConfigurationPolicyHandler handler(kPolicyOpenNetworkConfiguration);

+ NetworkConfigurationPolicyHandler handler(

+ kPolicyOpenNetworkConfiguration,

+ chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));

EXPECT_TRUE(errors.GetErrors(kPolicyOpenNetworkConfiguration).empty());

@@ -45,7 +49,9 @@ TEST(NetworkConfigurationPolicyHandlerTest, WrongType) {

PolicyMap policy_map;

policy_map.Set(kPolicyOpenNetworkConfiguration,

Value::CreateBooleanValue(false));

- NetworkConfigurationPolicyHandler handler(kPolicyOpenNetworkConfiguration);

+ NetworkConfigurationPolicyHandler handler(

+ kPolicyOpenNetworkConfiguration,

+ chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));

EXPECT_FALSE(errors.GetErrors(kPolicyOpenNetworkConfiguration).empty());

@@ -56,7 +62,9 @@ TEST(NetworkConfigurationPolicyHandlerTest, JSONParseError) {

PolicyMap policy_map;

policy_map.Set(kPolicyOpenNetworkConfiguration,

Value::CreateStringValue(kTestONC));

- NetworkConfigurationPolicyHandler handler(kPolicyOpenNetworkConfiguration);

+ NetworkConfigurationPolicyHandler handler(

+ kPolicyOpenNetworkConfiguration,

+ chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));

EXPECT_FALSE(errors.GetErrors(kPolicyOpenNetworkConfiguration).empty());

@@ -79,7 +87,9 @@ TEST(NetworkConfigurationPolicyHandlerTest, Sanitization) {

PolicyMap policy_map;

policy_map.Set(kPolicyOpenNetworkConfiguration,

Value::CreateStringValue(kTestONC));

- NetworkConfigurationPolicyHandler handler(kPolicyOpenNetworkConfiguration);

+ NetworkConfigurationPolicyHandler handler(

+ kPolicyOpenNetworkConfiguration,

+ chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

handler.PrepareForDisplaying(&policy_map);

const Value* sanitized = policy_map.Get(kPolicyOpenNetworkConfiguration);