New policy protobuf protocol.

chrome/browser/policy/mock_configuration_policy_provider.cc

 // Copyright (c) 2010 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/mock_configuration_policy_provider.h"
 
 #include "base/stl_util-inl.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 
 namespace policy {
 
 MockConfigurationPolicyProvider::MockConfigurationPolicyProvider()
     : ConfigurationPolicyProvider(
           ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList()),
       initialization_complete_(false) {
 }
 
-MockConfigurationPolicyProvider::~MockConfigurationPolicyProvider() {
-  STLDeleteValues(&policy_map_);
-}
+MockConfigurationPolicyProvider::~MockConfigurationPolicyProvider() {}
 
 void MockConfigurationPolicyProvider::AddPolicy(ConfigurationPolicyType policy,
                                                 Value* value) {
-  std::swap(policy_map_[policy], value);
-  delete value;
+  policy_map_.Set(policy, value);
 }
 
 void MockConfigurationPolicyProvider::RemovePolicy(
     ConfigurationPolicyType policy) {
-  const PolicyMap::iterator entry = policy_map_.find(policy);
-  if (entry != policy_map_.end()) {
-    delete entry->second;
-    policy_map_.erase(entry);
-  }
+  policy_map_.Erase(policy);
 }
 
 void MockConfigurationPolicyProvider::SetInitializationComplete(
     bool initialization_complete) {
   initialization_complete_ = initialization_complete;
 }
 
 bool MockConfigurationPolicyProvider::Provide(
     ConfigurationPolicyStoreInterface* store) {
   for (PolicyMap::const_iterator current = policy_map_.begin();
        current != policy_map_.end(); ++current) {
     store->Apply(current->first, current->second->DeepCopy());
   }
   return true;
 }
 
 bool MockConfigurationPolicyProvider::IsInitializationComplete() const {
   return initialization_complete_;
 }
 
-}
+}  // namespace policy