| Index: chrome/browser/policy/configuration_policy_provider.h
 | 
| diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h
 | 
| index af2cddf914d8d30bc56ba1373b1d347513c38650..4eedab65d1ad3e3079cd4302f1d9569ce6b58a1b 100644
 | 
| --- a/chrome/browser/policy/configuration_policy_provider.h
 | 
| +++ b/chrome/browser/policy/configuration_policy_provider.h
 | 
| @@ -6,12 +6,14 @@
 | 
|  #define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_H_
 | 
|  #pragma once
 | 
|  
 | 
| +#include <map>
 | 
|  #include <string>
 | 
|  
 | 
|  #include "base/basictypes.h"
 | 
|  #include "base/scoped_ptr.h"
 | 
|  #include "base/values.h"
 | 
|  #include "chrome/browser/policy/configuration_policy_store_interface.h"
 | 
| +#include "policy/configuration_policy_type.h"
 | 
|  
 | 
|  namespace policy {
 | 
|  
 | 
| @@ -20,6 +22,8 @@ namespace policy {
 | 
|  // etc.) should implement a subclass of this class.
 | 
|  class ConfigurationPolicyProvider {
 | 
|   public:
 | 
| +  typedef std::map<ConfigurationPolicyType, Value*> PolicyMapType;
 | 
| +
 | 
|    class Observer {
 | 
|     public:
 | 
|      virtual ~Observer() {}
 | 
| @@ -59,9 +63,14 @@ class ConfigurationPolicyProvider {
 | 
|  
 | 
|   protected:
 | 
|    // Decodes the value tree and writes the configuration to the given |store|.
 | 
| -  void DecodePolicyValueTree(const DictionaryValue* policies,
 | 
| +  void ApplyPolicyValueTree(const DictionaryValue* policies,
 | 
|                               ConfigurationPolicyStoreInterface* store);
 | 
|  
 | 
| +  // Writes the configuration found in the already-decoded map |policies| to
 | 
| +  // the given |store|.
 | 
| +  void ApplyPolicyMap(const PolicyMapType* policies,
 | 
| +                      ConfigurationPolicyStoreInterface* store);
 | 
| +
 | 
|    const PolicyDefinitionList* policy_definition_list() const {
 | 
|      return policy_definition_list_;
 | 
|    }
 | 
| 
 |