chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc - Issue 1350913006: Revert of Add source column to chrome://policy showing the origins of policies.

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

Issue 1350913006: Revert of Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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

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

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 a5691b8bbadad0d519d5d91316f5049e088b856c..b654188ead171425120fd340481997569bfbd995 100644

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

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

@@ -14,7 +14,6 @@

#include "components/policy/core/browser/policy_error_map.h"

#include "components/policy/core/common/external_data_fetcher.h"

#include "components/policy/core/common/policy_map.h"

-#include "components/policy/core/common/policy_types.h"

#include "components/policy/core/common/schema.h"

#include "policy/policy_constants.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -62,7 +61,6 @@

policy_.Set(key::kScreenMagnifierType,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(0),

NULL);

handler_.ApplyPolicySettings(policy_, &prefs_);

@@ -83,7 +81,6 @@

policy_.Set(key::kScreenMagnifierType,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(1),

NULL);

handler_.ApplyPolicySettings(policy_, &prefs_);

@@ -112,7 +109,6 @@

policy_map.Set(key::kUserAvatarImage,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(false),

NULL);

PolicyErrorMap errors;

@@ -128,7 +124,6 @@

policy_map.Set(key::kUserAvatarImage,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

dict.release(),

NULL);

PolicyErrorMap errors;

@@ -145,7 +140,6 @@

policy_map.Set(key::kUserAvatarImage,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

dict.release(),

NULL);

PolicyErrorMap errors;

@@ -161,7 +155,6 @@

policy_map.Set(key::kUserAvatarImage,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

dict.release(),

NULL);

PolicyErrorMap errors;

@@ -178,7 +171,6 @@

policy_map.Set(key::kUserAvatarImage,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

dict.release(),

NULL);

PolicyErrorMap errors;

@@ -197,7 +189,6 @@

policy_map.Set(key::kUserAvatarImage,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

dict.release(),

NULL);

PolicyErrorMap errors;

@@ -258,7 +249,6 @@

policy_map.Set(key::kOpenNetworkConfiguration,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue(kTestONC),

NULL);

scoped_ptr<NetworkConfigurationPolicyHandler> handler(

@@ -273,7 +263,6 @@

policy_map.Set(key::kOpenNetworkConfiguration,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(false),

NULL);

scoped_ptr<NetworkConfigurationPolicyHandler> handler(

@@ -289,7 +278,6 @@

policy_map.Set(key::kOpenNetworkConfiguration,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue(kTestONC),

NULL);

scoped_ptr<NetworkConfigurationPolicyHandler> handler(

@@ -318,7 +306,6 @@

policy_map.Set(key::kOpenNetworkConfiguration,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::StringValue(kTestONC),

NULL);

scoped_ptr<NetworkConfigurationPolicyHandler> handler(

@@ -343,8 +330,7 @@

PinnedLauncherAppsPolicyHandler handler;

policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY,

- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, list.DeepCopy(),

- nullptr);

+ POLICY_SCOPE_USER, list.DeepCopy(), NULL);

handler.ApplyPolicySettings(policy_map, &prefs);

EXPECT_TRUE(prefs.GetValue(prefs::kPinnedLauncherApps, &value));

EXPECT_TRUE(base::Value::Equals(&expected_pinned_apps, value));

@@ -355,8 +341,7 @@

expected_pinned_apps.Append(entry1_dict);

list.Append(entry1.DeepCopy());

policy_map.Set(key::kPinnedLauncherApps, POLICY_LEVEL_MANDATORY,

- POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, list.DeepCopy(),

- nullptr);

+ POLICY_SCOPE_USER, list.DeepCopy(), NULL);

prefs.Clear();

handler.ApplyPolicySettings(policy_map, &prefs);

EXPECT_TRUE(prefs.GetValue(prefs::kPinnedLauncherApps, &value));

@@ -376,7 +361,6 @@

policy_map.Set(

key::kDeviceLoginScreenPowerManagement, POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

base::JSONReader::Read(kLoginScreenPowerManagementPolicy).release(),

NULL);

LoginScreenPowerManagementPolicyHandler handler(chrome_schema_);

@@ -390,7 +374,6 @@

policy_map.Set(key::kDeviceLoginScreenPowerManagement,

POLICY_LEVEL_MANDATORY,

POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

new base::FundamentalValue(false),

NULL);

LoginScreenPowerManagementPolicyHandler handler(chrome_schema_);