Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/user_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_USER_POLICY_CACHE_H_
 #define CHROME_BROWSER_POLICY_USER_POLICY_CACHE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 42 matching lines @@
 
   // UserPolicyDiskCache::Delegate implementation:
   virtual void OnDiskCacheLoaded(
       UserPolicyDiskCache::LoadResult result,
       const enterprise_management::CachedCloudPolicyResponse&
           cached_response) OVERRIDE;
 
   // 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();
 
   // <Old-style policy support>
   // 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|.
+  //
+  // If |policies| is empty and |policy_data| contains a field named
+  // "repeated GenericNamedValue named_value = 2;", the policies in that field
+  // are added to |policies| as LEVEL_MANDATORY, SCOPE_USER policies.
   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;
 
   // </Old-style policy support>
 
   // Manages the cache file.
   scoped_refptr<UserPolicyDiskCache> disk_cache_;
 
   // Used for constructing the weak ptr passed to |disk_cache_|.
   base::WeakPtrFactory<UserPolicyDiskCache::Delegate> weak_ptr_factory_;
 
   // True if the disk cache has been loaded.
   bool disk_cache_ready_;
 
   // True if at least one attempt was made to refresh the cache with a freshly
   // fetched policy, or if there is no need to wait for that.
   bool fetch_ready_;
 
   DISALLOW_COPY_AND_ASSIGN(UserPolicyCache);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_USER_POLICY_CACHE_H_