Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/config_dir_policy_provider_unittest.cc

-// 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.
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/json/json_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 41 matching lines @@
 TestHarness::TestHarness() {}
 
 TestHarness::~TestHarness() {}
 
 void TestHarness::SetUp() {
   ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
 }
 
 AsynchronousPolicyProvider* TestHarness::CreateProvider(
     const PolicyDefinitionList* policy_definition_list) {
-  return new ConfigDirPolicyProvider(policy_definition_list, test_dir());
+  return new ConfigDirPolicyProvider(policy_definition_list,
+                                     POLICY_LEVEL_MANDATORY,
+                                     test_dir());
 }
 
 void TestHarness::InstallEmptyPolicy() {
   DictionaryValue dict;
   WriteConfigFile(dict, "policy");
 }
 
 void TestHarness::InstallStringPolicy(const std::string& policy_name,
                                       const std::string& policy_value) {
   DictionaryValue dict;
@@ skipping 90 matching lines @@
   for (unsigned int i = 5; i <= 8; ++i)
     harness_.WriteConfigFile(test_dict_bar, base::IntToString(i));
 
   ConfigDirPolicyProviderDelegate loader(harness_.test_dir());
   scoped_ptr<base::DictionaryValue> policy(loader.Load());
   EXPECT_TRUE(policy.get());
   EXPECT_TRUE(policy->Equals(&test_dict_foo));
 }
 
 }  // namespace policy