Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/ui/webui/policy_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/policy_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/hash_tables.h"
 #include "base/stl_util.h"
@@ skipping 174 matching lines @@
       base::Bind(&PolicyUIHandler::OnRefreshDone,
                  weak_factory_.GetWeakPtr()));
 }
 
 void PolicyUIHandler::OnRefreshDone() {
   web_ui()->CallJavascriptFunction("Policy.refreshDone");
 }
 
 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);
   web_ui()->CallJavascriptFunction("Policy.returnData", results);
 }
 
 // static
 string16 PolicyUIHandler::GetPolicyScopeString(policy::PolicyScope scope) {
   switch (scope) {
     case policy::POLICY_SCOPE_USER:
@@ skipping 155 matching lines @@
 PolicyUI::PolicyUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new PolicyUIHandler);
 
   // Set up the chrome://policy/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   ChromeURLDataManager::AddDataSource(profile, CreatePolicyUIHTMLSource());
 }
 
 PolicyUI::~PolicyUI() {
 }