Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/user_policy_cache.h

Index: chrome/browser/policy/user_policy_cache.h
diff --git a/chrome/browser/policy/user_policy_cache.h b/chrome/browser/policy/user_policy_cache.h
index 1696430fa763f25fcd994bb5f8ec7074b2de06d5..ab11cae1d335538ecd891d2f7aea19e4ad3f186c 100644
--- a/chrome/browser/policy/user_policy_cache.h
+++ b/chrome/browser/policy/user_policy_cache.h
@@ -60,8 +60,7 @@ class UserPolicyCache : public CloudPolicyCacheBase,
   // CloudPolicyCacheBase implementation:
   virtual bool DecodePolicyData(
       const enterprise_management::PolicyData& policy_data,
-      PolicyMap* mandatory,
-      PolicyMap* recommended) OVERRIDE;
+      PolicyMap* policies) OVERRIDE;
 
   // Checks if this cache is ready, and invokes SetReady() if so.
   void CheckIfReady();
@@ -70,13 +69,8 @@ class UserPolicyCache : public CloudPolicyCacheBase,
   // The following member functions are needed to support old-style policy and
   // can be removed once all server-side components (CPanel, D3) have been
   // migrated to providing the new policy format.
-
-  // If |mandatory| and |recommended| are both empty, and |policy_data|
-  // contains a field named "repeated GenericNamedValue named_value = 2;",
-  // this field is decoded into |mandatory|.

[Mattias Nissler (ping if slow), 2012/01/17 09:52:45]

Please keep this comment, updating it to reflect the |policies| change.

[Joao da Silva, 2012/01/17 13:09:29]

Done.

   void MaybeDecodeOldstylePolicy(const std::string& policy_data,
-                                 PolicyMap* mandatory,
-                                 PolicyMap* recommended);
+                                 PolicyMap* policies);
 
   Value* DecodeIntegerValue(google::protobuf::int64 value) const;
   Value* DecodeValue(const enterprise_management::GenericValue& value) const;