Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/configuration_policy_provider_test.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_CONFIGURATION_POLICY_PROVIDER_TEST_H_
 #define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_TEST_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/browser/policy/asynchronous_policy_test_base.h"
 #include "content/test/test_browser_thread.h"
-#include "policy/configuration_policy_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class ListValue;
 }
 
 namespace policy {
 
 class AsynchronousPolicyProvider;
 struct PolicyDefinitionList;
 
 // A stripped-down policy definition list that contains entries for the
 // different policy setting types supported.
 namespace test_policy_definitions {
 
 // String policy keys.
 extern const char kKeyString[];
 extern const char kKeyBoolean[];
 extern const char kKeyInteger[];
 extern const char kKeyStringList[];
 
-// Corresponding type constants.
-extern const ConfigurationPolicyType kPolicyString;
-extern const ConfigurationPolicyType kPolicyBoolean;
-extern const ConfigurationPolicyType kPolicyInteger;
-extern const ConfigurationPolicyType kPolicyStringList;
-
 // Policy definition list that contains entries for the keys above.
 extern const PolicyDefinitionList kList;
 
 }  // namespace test_policy_definitions
 
 // An interface for creating a test policy provider and creating a policy
 // provider instance for testing. Used as the parameter to the abstract
 // ConfigurationPolicyProviderTest below.
 class PolicyProviderTestHarness {
  public:
@@ skipping 34 matching lines @@
  protected:
   ConfigurationPolicyProviderTest();
   virtual ~ConfigurationPolicyProviderTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // Installs a valid policy and checks whether the provider returns the
   // |expected_value|.
   void CheckValue(const char* policy_name,
-                  ConfigurationPolicyType policy_type,
                   const base::Value& expected_value,
                   base::Closure install_value);
 
   scoped_ptr<PolicyProviderTestHarness> test_harness_;
   scoped_ptr<AsynchronousPolicyProvider> provider_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProviderTest);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_TEST_H_