Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/device_policy_cache.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_POLICY_DEVICE_POLICY_CACHE_H_
 #define CHROME_BROWSER_POLICY_DEVICE_POLICY_CACHE_H_
 #pragma once
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/login/signed_settings.h"
@@ skipping 35 matching lines @@
   // Alternate c'tor allowing tests to mock out the SignedSettingsHelper
   // singleton.
   DevicePolicyCache(
       CloudPolicyDataStore* data_store,
       EnterpriseInstallAttributes* install_attributes,
       chromeos::SignedSettingsHelper* signed_settings_helper);
 
   // 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);
 
   // Checks with immutable attributes whether this is an enterprise device and
   // read the registration user if this is the case.
   void CheckImmutableAttributes();
 
   // Tries to install the initial device policy retrieved from signed settings.
   // Fills in |device_token| if it could be extracted from the loaded protobuf.
   void InstallInitialPolicy(
       chromeos::SignedSettings::ReturnCode code,
       const enterprise_management::PolicyFetchResponse& policy,
       std::string* device_token);
 
   static void DecodeDevicePolicy(
       const enterprise_management::ChromeDeviceSettingsProto& policy,
-      PolicyMap* mandatory,
-      PolicyMap* recommended);
+      PolicyMap* policies);
 
   CloudPolicyDataStore* data_store_;
   EnterpriseInstallAttributes* install_attributes_;
 
   chromeos::SignedSettingsHelper* signed_settings_helper_;
 
   base::WeakPtrFactory<DevicePolicyCache> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DevicePolicyCache);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_POLICY_CACHE_H_