Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/ui/webui/policy_ui.cc

Index: chrome/browser/ui/webui/policy_ui.cc
diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc
index 91e3f48e2d548389e0b036bca1d0f92dd713d7d7..6c007d1b3bec2bcc74d96901ef33e87c1befd0ba 100644
--- a/chrome/browser/ui/webui/policy_ui.cc
+++ b/chrome/browser/ui/webui/policy_ui.cc
@@ -192,17 +192,14 @@ void PolicyUIHandler::OnRefreshDone() {
 
 void PolicyUIHandler::SendDataToUI() {
   policy::PolicyService* service = g_browser_process->policy_service();
-  const policy::PolicyMap* policies =
-      service->GetPolicies(policy::POLICY_DOMAIN_CHROME, "");
   bool any_policies_set = false;
-  base::ListValue* list;
-  if (policies)
-    list = GetPolicyStatusList(*policies, &any_policies_set).release();
-  else
-    list = new base::ListValue();
+  scoped_ptr<base::ListValue> list(

[James Hawkins, 2012/05/15 16:33:32]

nit: No need to use a scoped_ptr here.

[Joao da Silva, 2012/05/15 16:42:17]

Done.

+      GetPolicyStatusList(
+          service->GetPolicies(policy::POLICY_DOMAIN_CHROME, ""),

[James Hawkins, 2012/05/15 16:33:32]

nit: "" should either be string16() or std::string() depending on the type of
the paramter.

[Joao da Silva, 2012/05/15 16:42:17]

Done.

+          &any_policies_set));
 
   base::DictionaryValue results;
-  results.Set("policies", list);
+  results.Set("policies", list.release());
   results.SetBoolean("anyPoliciesSet", any_policies_set);
   base::DictionaryValue* dict = GetStatusData();
   results.Set("status", dict);