chrome/browser/policy/configuration_policy_handler_chromeos_unittest.cc - Issue 11299236: This moves the ONC parsing code into chromeos/network/onc

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

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unit tests Created 8 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 6f265a4253cc39ccfee24cb4fda64d97ac956ba8..cd0244987a3aba344301c7340e81070cc6c33f9c 100644

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

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

@@ -18,7 +18,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, Empty) {

PolicyMap policy_map;

NetworkConfigurationPolicyHandler handler(

key::kOpenNetworkConfiguration,

- chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

+ chromeos::onc::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

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

EXPECT_TRUE(errors.GetErrors(key::kOpenNetworkConfiguration).empty());

@@ -46,7 +46,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, ValidONC) {

Value::CreateStringValue(kTestONC));

NetworkConfigurationPolicyHandler handler(

key::kOpenNetworkConfiguration,

- chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

+ chromeos::onc::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

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

EXPECT_TRUE(errors.GetErrors(key::kOpenNetworkConfiguration).empty());

@@ -60,7 +60,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, WrongType) {

Value::CreateBooleanValue(false));

NetworkConfigurationPolicyHandler handler(

key::kOpenNetworkConfiguration,

- chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

+ chromeos::onc::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

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

EXPECT_FALSE(errors.GetErrors(key::kOpenNetworkConfiguration).empty());

@@ -75,7 +75,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, JSONParseError) {

Value::CreateStringValue(kTestONC));

NetworkConfigurationPolicyHandler handler(

key::kOpenNetworkConfiguration,

- chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

+ chromeos::onc::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

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

EXPECT_FALSE(errors.GetErrors(key::kOpenNetworkConfiguration).empty());

@@ -103,7 +103,7 @@ TEST(NetworkConfigurationPolicyHandlerTest, Sanitization) {

Value::CreateStringValue(kTestONC));

NetworkConfigurationPolicyHandler handler(

key::kOpenNetworkConfiguration,

- chromeos::NetworkUIData::ONC_SOURCE_USER_POLICY);

+ chromeos::onc::ONC_SOURCE_USER_POLICY);

PolicyErrorMap errors;

handler.PrepareForDisplaying(&policy_map);

const Value* sanitized = policy_map.GetValue(key::kOpenNetworkConfiguration);