Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/mock_configuration_policy_provider.h

Index: chrome/browser/policy/mock_configuration_policy_provider.h
diff --git a/chrome/browser/policy/mock_configuration_policy_provider.h b/chrome/browser/policy/mock_configuration_policy_provider.h
index 105a4ed8ffd2873c566e69d9d0e3c016c33f295f..c70c3d0ea758ed21949f4d8a4b2d760fadc99694 100644
--- a/chrome/browser/policy/mock_configuration_policy_provider.h
+++ b/chrome/browser/policy/mock_configuration_policy_provider.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -19,8 +19,9 @@ class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
   MockConfigurationPolicyProvider();
   virtual ~MockConfigurationPolicyProvider();
 
-  void AddPolicy(ConfigurationPolicyType policy, Value* value);
-  void RemovePolicy(ConfigurationPolicyType policy);
+  void AddPolicy(const std::string& policy, Value* value);
+  void AddRecommendedPolicy(const std::string& policy, Value* value);

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

Hm, this looks weird. Either rename to AddMandatoryPolicy() or scrap
AddRecommendedPolicy and pass in the level as a parameter.

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

Renamed to AddMandatoryPolicy.

+  void RemovePolicy(const std::string& policy);
 
   void SetInitializationComplete(bool initialization_complete);