Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/policy/asynchronous_policy_provider.cc

Index: chrome/browser/policy/asynchronous_policy_provider.cc
diff --git a/chrome/browser/policy/asynchronous_policy_provider.cc b/chrome/browser/policy/asynchronous_policy_provider.cc
index 01a647c5ab7b9d0dd11f4c76b1c59b187039dcec..911a251a14ca9246cf54ca8f33b62e133ad8eb6c 100644
--- a/chrome/browser/policy/asynchronous_policy_provider.cc
+++ b/chrome/browser/policy/asynchronous_policy_provider.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "chrome/browser/policy/asynchronous_policy_loader.h"
-#include "chrome/browser/policy/policy_map.h"
+#include "chrome/browser/policy/policy_bundle.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -32,12 +32,6 @@ AsynchronousPolicyProvider::~AsynchronousPolicyProvider() {
   loader_->Stop();
 }
 
-bool AsynchronousPolicyProvider::ProvideInternal(PolicyMap* map) {
-  DCHECK(CalledOnValidThread());
-  map->CopyFrom(loader_->policy());
-  return true;
-}
-
 void AsynchronousPolicyProvider::RefreshPolicies() {
   DCHECK(CalledOnValidThread());
   pending_refreshes_++;
@@ -63,10 +57,11 @@ void AsynchronousPolicyProvider::OnReloadPosted() {
   pending_refreshes_--;
 }
 
-void AsynchronousPolicyProvider::OnLoaderReloaded() {
+void AsynchronousPolicyProvider::OnLoaderReloaded(
+    scoped_ptr<PolicyBundle> bundle) {
   DCHECK(CalledOnValidThread());
   if (pending_refreshes_ == 0)
-    NotifyPolicyUpdated();
+    UpdatePolicy(bundle.Pass());
 }
 
 }  // namespace policy