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

chrome/browser/ui/webui/policy_ui_browsertest.cc

Index: chrome/browser/ui/webui/policy_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc
index 161a734a735981668475392a7b3ad5eda7b84366..45a91e7d5897520174da140ba1fe053bf0407fb2 100644
--- a/chrome/browser/ui/webui/policy_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc
@@ -41,6 +41,7 @@ namespace {
 std::vector<std::string> PopulateExpectedPolicy(
     const std::string& name,
     const std::string& value,
+    const std::string& source,

[Thiemo Nagel, 2015/09/01 17:40:36]

I don't see a point in adding the source here.  It seems unused, doesn't it?

[fhorschig, 2015/09/04 06:53:53]

Equals compares for sources. This is a good thing as this ensures that the
displayed source is in fact based on the actually set source.

     const policy::PolicyMap::Entry* metadata,
     bool unknown) {
   std::vector<std::string> expected_policy;
@@ -69,6 +70,9 @@ std::vector<std::string> PopulateExpectedPolicy(
   // Populate expected policy value.
   expected_policy.push_back(value);
 
+  // Populate expected source name.
+  expected_policy.push_back(source);
+
   // Populate expected status.
   if (unknown)
     expected_policy.push_back(l10n_util::GetStringUTF8(IDS_POLICY_UNKNOWN));
@@ -118,9 +122,9 @@ void PolicyUITest::SetUpInProcessBrowserTestFixture() {
 }
 
 void PolicyUITest::UpdateProviderPolicy(const policy::PolicyMap& policy) {
- provider_.UpdateChromePolicy(policy);
- base::RunLoop loop;
- loop.RunUntilIdle();
+  provider_.UpdateChromePolicy(policy);
+  base::RunLoop loop;
+  loop.RunUntilIdle();
 }
 
 void PolicyUITest::VerifyPolicies(
@@ -186,8 +190,8 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyNames) {
   ASSERT_TRUE(chrome_schema.valid());
   for (policy::Schema::Iterator it = chrome_schema.GetPropertiesIterator();
        !it.IsAtEnd(); it.Advance()) {
-    expected_policies.push_back(
-        PopulateExpectedPolicy(it.key(), std::string(), NULL, false));
+    expected_policies.push_back(PopulateExpectedPolicy(
+        it.key(), std::string(), std::string(), NULL, false));
   }
 
   // Retrieve the contents of the policy table from the UI and verify that it
@@ -208,37 +212,28 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyValues) {
   restore_on_startup_urls->Append(new base::StringValue("aaa"));
   restore_on_startup_urls->Append(new base::StringValue("bbb"));
   restore_on_startup_urls->Append(new base::StringValue("ccc"));
-  values.Set(policy::key::kRestoreOnStartupURLs,
-             policy::POLICY_LEVEL_MANDATORY,
-             policy::POLICY_SCOPE_USER,
-             restore_on_startup_urls,
-             NULL);
+  values.Set(policy::key::kRestoreOnStartupURLs, policy::POLICY_LEVEL_MANDATORY,

[Thiemo Nagel, 2015/09/01 17:40:36]

Don't change existing formatting!

[fhorschig, 2015/09/04 06:53:53]

Done.

+             policy::POLICY_SCOPE_USER, restore_on_startup_urls, NULL,
+             policy::POLICY_SOURCE_DEFAULT);
   expected_values[policy::key::kRestoreOnStartupURLs] = "aaa,bbb,ccc";
-  values.Set(policy::key::kHomepageLocation,
-             policy::POLICY_LEVEL_MANDATORY,
+  values.Set(policy::key::kHomepageLocation, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_MACHINE,
-             new base::StringValue("http://google.com"),
-             NULL);
+             new base::StringValue("http://google.com"), NULL,
+             policy::POLICY_SOURCE_DEFAULT);
   expected_values[policy::key::kHomepageLocation] = "http://google.com";
-  values.Set(policy::key::kRestoreOnStartup,
-             policy::POLICY_LEVEL_RECOMMENDED,
-             policy::POLICY_SCOPE_USER,
-             new base::FundamentalValue(4),
-             NULL);
+  values.Set(policy::key::kRestoreOnStartup, policy::POLICY_LEVEL_RECOMMENDED,
+             policy::POLICY_SCOPE_USER, new base::FundamentalValue(4), NULL,
+             policy::POLICY_SOURCE_DEFAULT);
   expected_values[policy::key::kRestoreOnStartup] = "4";
-  values.Set(policy::key::kShowHomeButton,
-             policy::POLICY_LEVEL_RECOMMENDED,
-             policy::POLICY_SCOPE_MACHINE,
-             new base::FundamentalValue(true),
-             NULL);
+  values.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_RECOMMENDED,
+             policy::POLICY_SCOPE_MACHINE, new base::FundamentalValue(true),
+             NULL, policy::POLICY_SOURCE_DEFAULT);
   expected_values[policy::key::kShowHomeButton] = "true";
   // Set the value of a policy that does not exist.
   const std::string kUnknownPolicy = "NoSuchThing";
-  values.Set(kUnknownPolicy,
-             policy::POLICY_LEVEL_MANDATORY,
-             policy::POLICY_SCOPE_USER,
-             new base::FundamentalValue(true),
-             NULL);
+  values.Set(kUnknownPolicy, policy::POLICY_LEVEL_MANDATORY,
+             policy::POLICY_SCOPE_USER, new base::FundamentalValue(true), NULL,
+             policy::POLICY_SOURCE_DEFAULT);
   expected_values[kUnknownPolicy] = "true";
   UpdateProviderPolicy(values);
 
@@ -259,16 +254,15 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, SendPolicyValues) {
         it == expected_values.end() ? std::string() : it->second;
     const policy::PolicyMap::Entry* metadata = values.Get(props.key());
     expected_policies.insert(
-        metadata ? expected_policies.begin() + first_unset_position++ :
-                   expected_policies.end(),
-        PopulateExpectedPolicy(props.key(), value, metadata, false));
+        metadata ? expected_policies.begin() + first_unset_position++
+                 : expected_policies.end(),
+        PopulateExpectedPolicy(props.key(), value, std::string(), metadata,
+                               false));
   }
   expected_policies.insert(
       expected_policies.begin() + first_unset_position++,
-      PopulateExpectedPolicy(kUnknownPolicy,
-                             expected_values[kUnknownPolicy],
-                             values.Get(kUnknownPolicy),
-                             true));
+      PopulateExpectedPolicy(kUnknownPolicy, expected_values[kUnknownPolicy],
+                             std::string(), values.Get(kUnknownPolicy), true));
 
   // Retrieve the contents of the policy table from the UI and verify that it
   // matches the expectation.
@@ -317,12 +311,12 @@ IN_PROC_BROWSER_TEST_F(PolicyUITest, ExtensionLoadAndSendPolicy) {
 
   for (policy::Schema::Iterator it = chrome_schema.GetPropertiesIterator();
        !it.IsAtEnd(); it.Advance()) {
-    expected_policies.push_back(
-        PopulateExpectedPolicy(it.key(), std::string(), NULL, false));
+    expected_policies.push_back(PopulateExpectedPolicy(
+        it.key(), std::string(), std::string(), NULL, false));
   }
   // Add newly added policy to expected policy list.
   expected_policies.push_back(PopulateExpectedPolicy(
-      newly_added_policy_name, std::string(), NULL, false));
+      newly_added_policy_name, std::string(), std::string(), NULL, false));
 
   // Verify if policy UI includes policy that extension have.
   VerifyPolicies(expected_policies);