Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/policy/configuration_policy_pref_store.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/policy/configuration_policy_pref_store.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 109 matching lines @@
   for (std::vector<std::string>::const_iterator pref(changed_prefs.begin());
        pref != changed_prefs.end();
        ++pref) {
     FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
                       OnPrefValueChanged(*pref));
   }
 }
 
 PrefValueMap* ConfigurationPolicyPrefStore::CreatePreferencesFromPolicies() {
   scoped_ptr<PrefValueMap> prefs(new PrefValueMap);
-  const PolicyMap* policies =
-      policy_service_->GetPolicies(POLICY_DOMAIN_CHROME, "");
-  if (!policies)
-    return prefs.release();
   PolicyMap filtered_policies;
-  filtered_policies.CopyFrom(*policies);
+  filtered_policies.CopyFrom(
+      policy_service_->GetPolicies(POLICY_DOMAIN_CHROME, ""));
   filtered_policies.FilterLevel(level_);
 
   scoped_ptr<PolicyErrorMap> errors(new PolicyErrorMap);
 
   const ConfigurationPolicyHandlerList* handler_list =
       g_browser_process->browser_policy_connector()->GetHandlerList();
   handler_list->ApplyPolicySettings(filtered_policies,
                                     prefs.get(),
                                     errors.get());
 
   // Retrieve and log the errors once the UI loop is ready. This is only an
   // issue during startup.
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(&LogErrors,
                                      base::Owned(errors.release())));
 
   return prefs.release();
 }
 
 }  // namespace policy