Add source column to chrome://policy showing the origins of policies.

components/policy/core/common/configuration_policy_provider_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/policy/core/common/configuration_policy_provider_test.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/values.h"
 #include "components/policy/core/common/configuration_policy_provider.h"
@@ skipping 128 matching lines @@
   Schema schema = Schema::Parse(schema_string, &error);
   if (schema.valid()) {
     schema_registry_.RegisterComponent(ns, schema);
     return true;
   }
   ADD_FAILURE() << error;
   return false;
 }
 
 PolicyProviderTestHarness::PolicyProviderTestHarness(PolicyLevel level,
-                                                     PolicyScope scope)
-    : level_(level), scope_(scope) {}
+                                                     PolicyScope scope,
+                                                     PolicySource source)
+    : level_(level), scope_(scope), source_(source) {}
 
 PolicyProviderTestHarness::~PolicyProviderTestHarness() {}
 
 PolicyLevel PolicyProviderTestHarness::policy_level() const {
   return level_;
 }
 
 PolicyScope PolicyProviderTestHarness::policy_scope() const {
   return scope_;
 }
 
+PolicySource PolicyProviderTestHarness::policy_source() const {
+  return source_;
+}
+
 void PolicyProviderTestHarness::Install3rdPartyPolicy(
     const base::DictionaryValue* policies) {
   FAIL();
 }
 
 ConfigurationPolicyProviderTest::ConfigurationPolicyProviderTest() {}
 
 ConfigurationPolicyProviderTest::~ConfigurationPolicyProviderTest() {}
 
 void ConfigurationPolicyProviderTest::SetUp() {
@@ skipping 42 matching lines @@
 void ConfigurationPolicyProviderTest::CheckValue(
     const char* policy_name,
     const base::Value& expected_value,
     base::Closure install_value) {
   // Install the value, reload policy and check the provider for the value.
   install_value.Run();
   provider_->RefreshPolicies();
   loop_.RunUntilIdle();
   PolicyBundle expected_bundle;
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
-      .Set(policy_name,
-           test_harness_->policy_level(),
-           test_harness_->policy_scope(),
-           expected_value.DeepCopy(),
-           NULL);
+      .SetWithSource(policy_name,
+                     test_harness_->policy_level(),
+                     test_harness_->policy_scope(),
+                     expected_value.DeepCopy(),
+                     NULL,

[bartfab (slow), 2015/09/14 14:42:27]

Nit: s/NULL/nullptr/

[fhorschig, 2015/09/16 13:52:05]

Done.

+                     test_harness_->policy_source());
   EXPECT_TRUE(provider_->policies().Equals(expected_bundle));
   // TODO(joaodasilva): set the policy in the POLICY_DOMAIN_EXTENSIONS too,
   // and extend the |expected_bundle|, once all providers are ready.
 }
 
 TEST_P(ConfigurationPolicyProviderTest, Empty) {
   provider_->RefreshPolicies();
   loop_.RunUntilIdle();
   const PolicyBundle kEmptyBundle;
   EXPECT_TRUE(provider_->policies().Equals(kEmptyBundle));
@@ skipping 91 matching lines @@
   EXPECT_TRUE(provider_->policies().Equals(bundle));
 
   // OnUpdatePolicy is called when there are changes.
   test_harness_->InstallStringPolicy(test_keys::kKeyString, "value");
   EXPECT_CALL(observer, OnUpdatePolicy(provider_.get())).Times(1);
   provider_->RefreshPolicies();
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
-      .Set(test_keys::kKeyString,
-           test_harness_->policy_level(),
-           test_harness_->policy_scope(),
-           new base::StringValue("value"),
-           NULL);
+      .SetWithSource(test_keys::kKeyString,
+                     test_harness_->policy_level(),
+                     test_harness_->policy_scope(),
+                     new base::StringValue("value"),
+                     NULL,

[bartfab (slow), 2015/09/14 14:42:27]

Nit: s/NULL/nullptr/

[fhorschig, 2015/09/16 13:52:05]

Done.

+                     test_harness_->policy_source());
   EXPECT_TRUE(provider_->policies().Equals(bundle));
   provider_->RemoveObserver(&observer);
 }
 
 Configuration3rdPartyPolicyProviderTest::
     Configuration3rdPartyPolicyProviderTest() {}
 
 Configuration3rdPartyPolicyProviderTest::
     ~Configuration3rdPartyPolicyProviderTest() {}
 
@@ skipping 27 matching lines @@
   // help detecting memory leaks in the code paths that detect invalid input.
   policy_3rdparty.Set("invalid-domain.component", policy_dict.DeepCopy());
   policy_3rdparty.Set("extensions.cccccccccccccccccccccccccccccccc",
                       new base::StringValue("invalid-value"));
   test_harness_->Install3rdPartyPolicy(&policy_3rdparty);
 
   provider_->RefreshPolicies();
   loop_.RunUntilIdle();
 
   PolicyMap expected_policy;
-  expected_policy.Set(test_keys::kKeyDictionary,
-                      test_harness_->policy_level(),
-                      test_harness_->policy_scope(),
-                      policy_dict.DeepCopy(),
-                      NULL);
+  expected_policy.SetWithSource(test_keys::kKeyDictionary,
+                                test_harness_->policy_level(),
+                                test_harness_->policy_scope(),
+                                policy_dict.DeepCopy(),
+                                NULL,

[bartfab (slow), 2015/09/14 14:42:27]

Nit: s/NULL/nullptr/

[fhorschig, 2015/09/16 13:52:05]

Done.

+                                test_harness_->policy_source());
   PolicyBundle expected_bundle;
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .CopyFrom(expected_policy);
   expected_policy.Clear();
   expected_policy.LoadFrom(&policy_dict,
                            test_harness_->policy_level(),
                            test_harness_->policy_scope());
+  expected_policy.ApplySourceToEntries(test_harness_->policy_source());

[bartfab (slow), 2015/09/14 14:42:27]

If LoadFrom() is able to set the level and scope, could it not set the source as
well, removing the need to call ApplySourceToEntries()?

[fhorschig, 2015/09/16 13:52:05]

Done.

   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS,
                                       "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"))
       .CopyFrom(expected_policy);
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS,
                                       "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"))
       .CopyFrom(expected_policy);
   EXPECT_TRUE(provider_->policies().Equals(expected_bundle));
 }
 
 }  // namespace policy