Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/cloud_policy_subsystem_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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 148 matching lines @@
     data_store_->set_user_name(kUsername);
     data_store_->SetGaiaToken(kAuthToken);
     data_store_->SetDeviceToken("", true);
     loop_.RunAllPending();
   }
 
   void VerifyTest(const std::string& homepage_location) {
     // Test conditions.
     EXPECT_EQ(CloudPolicySubsystem::SUCCESS, cloud_policy_subsystem_->state());
     StringValue homepage_value(homepage_location);
-    VerifyPolicy(kPolicyHomepageLocation, &homepage_value);
+    VerifyPolicy(key::kHomepageLocation, &homepage_value);
     VerifyServerLoad();
   }
 
   void VerifyState(CloudPolicySubsystem::PolicySubsystemState state) {
     EXPECT_EQ(state, cloud_policy_subsystem_->state());
   }
 
   void ExpectSuccessfulRegistration() {
     EXPECT_CALL(factory(), Intercept(kGaiaAuthHeader, "register", _, _))
         .WillOnce(CreateSuccessfulRegisterResponse(kDMToken));
@@ skipping 16 matching lines @@
     EXPECT_CALL(factory(), Intercept(kDMAuthHeader, "policy", _, _))
         .Times(n)
         .WillRepeatedly(CreateSuccessfulPolicyResponse(homepage, false, false));
   }
 
   TestingPolicyURLFetcherFactory& factory() { return *factory_; }
   CloudPolicyDataStore* data_store() { return data_store_.get(); }
 
  private:
   // Verifies for a given policy that it is provided by the subsystem.
-  void VerifyPolicy(enum ConfigurationPolicyType type, Value* expected) {
-    const PolicyMap* policy_map = cache_->policy(
-        CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY);
-    ASSERT_TRUE(Value::Equals(expected, policy_map->Get(type)));
+  void VerifyPolicy(const char* policy_name, Value* expected) {
+    const PolicyMap* policy_map = cache_->policy();
+    ASSERT_TRUE(Value::Equals(expected, policy_map->GetValue(policy_name)));
   }
 
   // Verifies that the last recorded run of the subsystem did not issue
   // too frequent requests:
   // - no more than 10 requests in the first 10 minutes
   // - no more then 12 requests per hour in the next 10 hours
   // TODO(gfeher): Thighten these conditions further. This will require
   // fine-tuning of the subsystem. See: http://crosbug.com/16637
   void VerifyServerLoad() {
     std::vector<int64> events;
@@ skipping 231 matching lines @@
 TEST_F(CloudPolicySubsystemSerialNumberRecoveryTest, SerialRequested) {
   InSequence s;
   ExpectSuccessfulRegistration();
   ExpectPolicyRequest("", true, true);
   ExpectPolicyRequest(kMachineId, false, false);
   ExpectPolicyRequest("", false, false);
   ExecuteTest();
 }
 
 }  // policy