chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc - Issue 1304843004: Add source column to chrome://policy showing the origins of policies.

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

Issue 1304843004: 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

« chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc ('K') | « chrome/browser/chromeos/policy/login_profile_policy_provider.cc ('k') | chrome/browser/policy/cloud/cloud_policy_browsertest.cc » ('j') | chrome/browser/policy/cloud/cloud_policy_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

index 8790d09f7bfa2b208c714c3d3f4ac6a60e0ba78a..8198d3334bbbd94b797865900980d91c1a5a833f 100644

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

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

@@ -112,23 +112,30 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {

chrome::RegisterLocalState(prefs_.registry());

// Set up a policy map for testing.

- policy_map_.Set(key::kHomepageLocation,

- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

- new base::StringValue("http://chromium.org"),

- NULL);

- policy_map_.Set(key::kChromeOsMultiProfileUserBehavior,

- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

- new base::StringValue("primary-only"),

- NULL);

- policy_map_.Set(key::kEasyUnlockAllowed,

- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

- new base::FundamentalValue(false),

- NULL);

- policy_map_.Set(key::kCaptivePortalAuthenticationIgnoresProxy,

- POLICY_LEVEL_MANDATORY,

- POLICY_SCOPE_USER,

- new base::FundamentalValue(false),

- NULL);

+ policy_map_.SetWithSource(key::kHomepageLocation,

+ POLICY_LEVEL_MANDATORY,

+ POLICY_SCOPE_USER,

+ new base::StringValue("http://chromium.org"),

+ NULL,

bartfab (slow) 2015/09/14 14:42:25 Nit: s/NULL/nullptr/

fhorschig 2015/09/16 13:52:04 Done.

+ POLICY_SOURCE_CLOUD);

bartfab (slow) 2015/09/14 14:42:25 Nit: #include "components/policy/core/common/polic

fhorschig 2015/09/16 13:52:04 Done.

+ policy_map_.SetWithSource(key::kChromeOsMultiProfileUserBehavior,

+ POLICY_LEVEL_MANDATORY,

+ POLICY_SCOPE_USER,

+ new base::StringValue("primary-only"),

+ NULL,

bartfab (slow) 2015/09/14 14:42:25 Nit: s/NULL/nullptr/

fhorschig 2015/09/16 13:52:04 Done.

+ POLICY_SOURCE_ENTERPRISE_DEFAULT);

+ policy_map_.SetWithSource(key::kEasyUnlockAllowed,

+ POLICY_LEVEL_MANDATORY,

+ POLICY_SCOPE_USER,

+ new base::FundamentalValue(false),

+ NULL,

bartfab (slow) 2015/09/14 14:42:26 Nit: s/NULL/nullptr/

fhorschig 2015/09/16 13:52:04 Done.

+ POLICY_SOURCE_CLOUD);

+ policy_map_.SetWithSource(key::kCaptivePortalAuthenticationIgnoresProxy,

+ POLICY_LEVEL_MANDATORY,

+ POLICY_SCOPE_USER,

+ new base::FundamentalValue(false),

+ NULL,

bartfab (slow) 2015/09/14 14:42:25 Nit: s/NULL/nullptr/

fhorschig 2015/09/16 13:52:04 Done.

+ POLICY_SOURCE_CLOUD);

expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))

.CopyFrom(policy_map_);