Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/file_based_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 "chrome/browser/policy/asynchronous_policy_loader.h"
 #include "chrome/browser/policy/asynchronous_policy_test_base.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/file_based_policy_provider.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_map.h"
@@ skipping 19 matching lines @@
 TEST_F(AsynchronousPolicyTestBase, ProviderInit) {
   base::Time last_modified;
   FileBasedPolicyProviderDelegateMock* provider_delegate =
       new FileBasedPolicyProviderDelegateMock();
   EXPECT_CALL(*provider_delegate, GetLastModification()).WillRepeatedly(
       Return(last_modified));
   InSequence s;
   EXPECT_CALL(*provider_delegate, Load()).WillOnce(Return(
       new DictionaryValue));
   DictionaryValue* policies = new DictionaryValue();
-  policies->SetBoolean(policy::key::kSyncDisabled, true);
+  policies->SetBoolean(key::kSyncDisabled, true);
   // A second call to Load gets triggered during the provider's construction
   // when the file watcher is initialized, since this file may have changed
   // between the initial load and creating watcher.
   EXPECT_CALL(*provider_delegate, Load()).WillOnce(Return(policies));
   FileBasedPolicyProvider provider(GetChromePolicyDefinitionList(),
+                                   POLICY_LEVEL_MANDATORY,
+                                   POLICY_SCOPE_USER,

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

SCOPE_MACHINE for consistency?

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

Done.

                                    provider_delegate);
   loop_.RunAllPending();
   PolicyMap policy_map;
   provider.Provide(&policy_map);
-  EXPECT_TRUE(policy_map.Get(policy::kPolicySyncDisabled));
+  EXPECT_TRUE(policy_map.Get(key::kSyncDisabled));
   EXPECT_EQ(1U, policy_map.size());
 }
 
 TEST_F(AsynchronousPolicyTestBase, ProviderRefresh) {
   base::Time last_modified;
   FileBasedPolicyProviderDelegateMock* provider_delegate =
       new FileBasedPolicyProviderDelegateMock();
   EXPECT_CALL(*provider_delegate, GetLastModification()).WillRepeatedly(
       Return(last_modified));
   InSequence s;
   EXPECT_CALL(*provider_delegate, Load()).WillOnce(Return(
       new DictionaryValue));
   FileBasedPolicyProvider file_based_provider(GetChromePolicyDefinitionList(),
+                                              POLICY_LEVEL_MANDATORY,
+                                              POLICY_SCOPE_USER,
                                               provider_delegate);
   // A second call to Load gets triggered during the provider's construction
   // when the file watcher is initialized, since this file may have changed
   // between the initial load and creating watcher.
   EXPECT_CALL(*provider_delegate, Load()).WillOnce(Return(
       new DictionaryValue));
   loop_.RunAllPending();
   // A third and final call to Load is made by the explicit Reload. This
   // should be the one that provides the current policy.
   DictionaryValue* policies = new DictionaryValue();
-  policies->SetBoolean(policy::key::kSyncDisabled, true);
+  policies->SetBoolean(key::kSyncDisabled, true);
   EXPECT_CALL(*provider_delegate, Load()).WillOnce(Return(policies));
   MockConfigurationPolicyObserver observer;
   ConfigurationPolicyObserverRegistrar registrar;
   registrar.Init(&file_based_provider, &observer);
   EXPECT_CALL(observer, OnUpdatePolicy(&file_based_provider)).Times(1);
   file_based_provider.RefreshPolicies();
   loop_.RunAllPending();
   PolicyMap policy_map;
   file_based_provider.Provide(&policy_map);
-  EXPECT_TRUE(policy_map.Get(policy::kPolicySyncDisabled));
+  EXPECT_TRUE(policy_map.Get(key::kSyncDisabled));
   EXPECT_EQ(1U, policy_map.size());
 }
 
 }  // namespace policy