Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps.

chrome/browser/policy/cloud_policy_provider.h

Index: chrome/browser/policy/cloud_policy_provider.h
diff --git a/chrome/browser/policy/cloud_policy_provider.h b/chrome/browser/policy/cloud_policy_provider.h
index 52ce81e6b4be43f82bae76833967a3824d2d1ad6..dd2566acb06e06734922af6fa1c025d69bc9e137 100644
--- a/chrome/browser/policy/cloud_policy_provider.h
+++ b/chrome/browser/policy/cloud_policy_provider.h
@@ -11,7 +11,6 @@
 #include "base/basictypes.h"
 #include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
-#include "chrome/browser/policy/policy_map.h"
 
 namespace policy {
 
@@ -39,7 +38,6 @@ class CloudPolicyProvider : public ConfigurationPolicyProvider,
 #endif
 
   // ConfigurationPolicyProvider implementation.
-  virtual bool ProvideInternal(PolicyMap* result) OVERRIDE;
   virtual bool IsInitializationComplete() const OVERRIDE;
   virtual void RefreshPolicies() OVERRIDE;
 
@@ -78,10 +76,6 @@ class CloudPolicyProvider : public ConfigurationPolicyProvider,
   // completed.
   std::set<const CloudPolicyCacheBase*> pending_updates_;
 
-  // The currently valid combination of the caches. ProvideInternal() fills
-  // |results| with a copy of |combined_|.
-  PolicyMap combined_;
-
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyProvider);
 };