Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1103)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/policy/core/common/policy_map_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: Moved policy source determiniation from providers to setting method. 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
« components/policy/core/common/configuration_policy_provider.cc ('K') | « components/policy/core/common/policy_map.cc ('k') | components/policy/core/common/policy_service_impl.cc » ('j') | components/policy/core/common/policy_service_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/policy/core/common/policy_map_unittest.cc
diff --git a/components/policy/core/common/policy_map_unittest.cc b/components/policy/core/common/policy_map_unittest.cc
index 356cabce7c812389103cf9263e34cc5ebb08eeb4..2b348b4102c5744ebe32f0ea3154eb6841ea3059 100644
--- a/components/policy/core/common/policy_map_unittest.cc
+++ b/components/policy/core/common/policy_map_unittest.cc
@@ -7,6 +7,7 @@
#include "base/callback.h"
#include "base/memory/weak_ptr.h"
#include "components/policy/core/common/external_data_manager.h"
+#include "components/policy/core/common/policy_types.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace policy {
@@ -25,13 +26,14 @@ const char kTestPolicyName8[] = "policy.test.8";
// Utility functions for the tests.
void SetPolicy(PolicyMap* map, const char* name, base::Value* value) {
- map->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, value, NULL);
+ map->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ value, nullptr);
}
void SetPolicy(PolicyMap* map,
const char* name,
ExternalDataFetcher* external_data_fetcher) {
- map->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ map->Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
NULL, external_data_fetcher);
}
@@ -66,8 +68,8 @@ TEST_F(PolicyMapTest, SetAndGet) {
EXPECT_EQ(POLICY_SCOPE_USER, entry->scope);
EXPECT_TRUE(ExternalDataFetcher::Equals(
entry->external_data_fetcher, CreateExternalDataFetcher("dummy").get()));
- map.Set(kTestPolicyName1, POLICY_LEVEL_RECOMMENDED,
- POLICY_SCOPE_MACHINE, NULL, NULL);
+ map.Set(kTestPolicyName1, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD, nullptr, nullptr);
EXPECT_FALSE(map.GetValue(kTestPolicyName1));
entry = map.Get(kTestPolicyName1);
ASSERT_TRUE(entry != NULL);
@@ -164,24 +166,30 @@ TEST_F(PolicyMapTest, MergeFrom) {
a.Set(kTestPolicyName1,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::StringValue("google.com"),
NULL);
a.Set(kTestPolicyName2,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
a.Set(kTestPolicyName3,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
NULL, CreateExternalDataFetcher("a").release());
a.Set(kTestPolicyName4,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(false),
NULL);
a.Set(kTestPolicyName5,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::StringValue("google.com/q={x}"),
NULL);
@@ -189,29 +197,36 @@ TEST_F(PolicyMapTest, MergeFrom) {
b.Set(kTestPolicyName1,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::StringValue("chromium.org"),
NULL);
b.Set(kTestPolicyName2,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(false),
NULL);
b.Set(kTestPolicyName3,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
NULL, CreateExternalDataFetcher("b").release());
b.Set(kTestPolicyName4,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
b.Set(kTestPolicyName5,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::StringValue(std::string()),
NULL);
b.Set(kTestPolicyName6,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
@@ -222,33 +237,40 @@ TEST_F(PolicyMapTest, MergeFrom) {
c.Set(kTestPolicyName1,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::StringValue("chromium.org"),
NULL);
// |a| has precedence over |b|.
c.Set(kTestPolicyName2,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
c.Set(kTestPolicyName3,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
NULL, CreateExternalDataFetcher("a").release());
// POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER for POLICY_LEVEL_RECOMMENDED.
c.Set(kTestPolicyName4,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
// POLICY_LEVEL_MANDATORY over POLICY_LEVEL_RECOMMENDED.
c.Set(kTestPolicyName5,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::StringValue(std::string()),
NULL);
// Merge new ones.
c.Set(kTestPolicyName6,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
@@ -260,32 +282,41 @@ TEST_F(PolicyMapTest, GetDifferingKeys) {
a.Set(kTestPolicyName1,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::StringValue("google.com"),
NULL);
a.Set(kTestPolicyName2,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
NULL, CreateExternalDataFetcher("dummy").release());
a.Set(kTestPolicyName3,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
a.Set(kTestPolicyName4,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
NULL, CreateExternalDataFetcher("a").release());
a.Set(kTestPolicyName5,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(false),
NULL);
a.Set(kTestPolicyName6,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::StringValue("google.com/q={x}"),
NULL);
a.Set(kTestPolicyName7,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
@@ -293,32 +324,41 @@ TEST_F(PolicyMapTest, GetDifferingKeys) {
b.Set(kTestPolicyName1,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::StringValue("google.com"),
NULL);
b.Set(kTestPolicyName2,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
NULL, CreateExternalDataFetcher("dummy").release());
b.Set(kTestPolicyName3,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(false),
NULL);
b.Set(kTestPolicyName4,
- POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ POLICY_SOURCE_CLOUD,
NULL, CreateExternalDataFetcher("b").release());
b.Set(kTestPolicyName5,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(false),
NULL);
b.Set(kTestPolicyName6,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::StringValue("google.com/q={x}"),
NULL);
b.Set(kTestPolicyName8,
POLICY_LEVEL_RECOMMENDED,
POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
new base::FundamentalValue(true),
NULL);
« components/policy/core/common/configuration_policy_provider.cc ('K') | « components/policy/core/common/policy_map.cc ('k') | components/policy/core/common/policy_service_impl.cc » ('j') | components/policy/core/common/policy_service_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698