| Index: chrome/browser/policy/device_policy_cache.h
|
| diff --git a/chrome/browser/policy/device_policy_cache.h b/chrome/browser/policy/device_policy_cache.h
|
| index d7f3c8e0076f4c38b4fc04a9bd59c1da8e8f8243..2157c9b5ee8026cf4b3038cdbc0d49d747abe275 100644
|
| --- a/chrome/browser/policy/device_policy_cache.h
|
| +++ b/chrome/browser/policy/device_policy_cache.h
|
| @@ -53,8 +53,7 @@ class DevicePolicyCache : public CloudPolicyCacheBase {
|
| // CloudPolicyCacheBase implementation:
|
| virtual bool DecodePolicyData(
|
| const enterprise_management::PolicyData& policy_data,
|
| - PolicyMap* mandatory,
|
| - PolicyMap* recommended) OVERRIDE;
|
| + PolicyMap* policies) OVERRIDE;
|
|
|
| void PolicyStoreOpCompleted(chromeos::SignedSettings::ReturnCode code);
|
|
|
| @@ -71,8 +70,7 @@ class DevicePolicyCache : public CloudPolicyCacheBase {
|
|
|
| static void DecodeDevicePolicy(
|
| const enterprise_management::ChromeDeviceSettingsProto& policy,
|
| - PolicyMap* mandatory,
|
| - PolicyMap* recommended);
|
| + PolicyMap* policies);
|
|
|
| CloudPolicyDataStore* data_store_;
|
| EnterpriseInstallAttributes* install_attributes_;
|
|
|