Removed ConfigurationPolicyType and extended PolicyMap.

chrome/browser/policy/cloud_policy_controller_unittest.cc

 // 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/cloud_policy_controller.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
@@ skipping 87 matching lines @@
     // Make this cache's disk cache ready, but have it still waiting for a
     // policy fetch.
     cache_->Load();
     loop_.RunAllPending();
     ASSERT_TRUE(cache_->last_policy_refresh_time().is_null());
     ASSERT_FALSE(cache_->IsReady());
   }
 
   void ExpectHasSpdyPolicy() {
     base::FundamentalValue expected(true);
-    const PolicyMap* policy_map = cache_->policy(
-        CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY);
-    ASSERT_TRUE(Value::Equals(&expected, policy_map->Get(kPolicyDisableSpdy)));
+    ASSERT_TRUE(Value::Equals(&expected,
+                              cache_->policy()->GetValue(key::kDisableSpdy)));
   }
 
  protected:
   scoped_ptr<CloudPolicyCacheBase> cache_;
   scoped_ptr<CloudPolicyController> controller_;
   scoped_ptr<MockDeviceTokenFetcher> token_fetcher_;
   scoped_ptr<CloudPolicyDataStore> data_store_;
   MockDeviceManagementService service_;
   PolicyNotifier notifier_;
   ScopedTempDir temp_user_data_dir_;
@@ skipping 219 matching lines @@
               CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH))
       .WillOnce(DoAll(InvokeWithoutArgs(&loop_, &MessageLoop::QuitNow),
                       service_.FailJob(DM_STATUS_REQUEST_FAILED)));
   CreateNewController();
   loop_.RunAllPending();
   EXPECT_TRUE(cache_->IsReady());
   EXPECT_TRUE(cache_->last_policy_refresh_time().is_null());
 }
 
 }  // namespace policy