Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/mock_configuration_policy_provider.h

-// 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.
 
 #ifndef CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 #define CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 #pragma once
 
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace policy {
 
 // Mock ConfigurationPolicyProvider implementation that supplies canned
 // values for polices.
 class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
  public:
   MockConfigurationPolicyProvider();
   virtual ~MockConfigurationPolicyProvider();
 
-  void AddPolicy(ConfigurationPolicyType policy, Value* value);
-  void RemovePolicy(ConfigurationPolicyType policy);
+  void AddMandatoryPolicy(const std::string& policy, Value* value);
+  void AddRecommendedPolicy(const std::string& policy, Value* value);
+  void RemovePolicy(const std::string& policy);
 
   void SetInitializationComplete(bool initialization_complete);
 
   // ConfigurationPolicyProvider method overrides.
   virtual bool ProvideInternal(PolicyMap* policies) OVERRIDE;
   virtual bool IsInitializationComplete() const OVERRIDE;
   virtual void RefreshPolicies() OVERRIDE;
 
   // Make public for tests.
   using ConfigurationPolicyProvider::NotifyPolicyUpdated;
@@ skipping 10 matching lines @@
   MockConfigurationPolicyObserver();
   virtual ~MockConfigurationPolicyObserver();
 
   MOCK_METHOD1(OnUpdatePolicy, void(ConfigurationPolicyProvider*));
   MOCK_METHOD1(OnProviderGoingAway, void(ConfigurationPolicyProvider*));
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_