| 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..32fc885833c28860faa58bb6ed531dbfc4f0c3a3 100644 | 
| --- a/chrome/browser/policy/configuration_policy_provider.h | 
| +++ b/chrome/browser/policy/configuration_policy_provider.h | 
| @@ -6,15 +6,19 @@ | 
| #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 { | 
|  | 
| +class PolicyMap; | 
| + | 
| // A mostly-abstract super class for platform-specific policy providers. | 
| // Platform-specific policy providers (Windows Group Policy, gconf, | 
| // etc.) should implement a subclass of this class. | 
| @@ -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 PolicyMap* policies, | 
| +                      ConfigurationPolicyStoreInterface* store); | 
| + | 
| const PolicyDefinitionList* policy_definition_list() const { | 
| return policy_definition_list_; | 
| } | 
|  |