Remove stl_util's deletion functions from chromeos/.

chromeos/network/policy_applicator.cc

 // Copyright 2013 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 "chromeos/network/policy_applicator.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_profile_client.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translator.h"
 #include "chromeos/network/policy_util.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/onc/onc_constants.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 void LogErrorMessage(const tracked_objects::Location& from_where,
                      const std::string& error_name,
                      const std::string& error_message) {
   LOG(ERROR) << from_where.ToString() << ": " << error_message;
 }
 
 const base::DictionaryValue* GetByGUID(
     const PolicyApplicator::GuidToPolicyMap& policies,
     const std::string& guid) {
-  PolicyApplicator::GuidToPolicyMap::const_iterator it = policies.find(guid);
+  auto it = policies.find(guid);
   if (it == policies.end())
     return NULL;
-  return it->second;
+  return it->second.get();
 }
 
 }  // namespace
 
 PolicyApplicator::PolicyApplicator(
     const NetworkProfile& profile,
     const GuidToPolicyMap& all_policies,
     const base::DictionaryValue& global_network_config,
     ConfigurationHandler* handler,
     std::set<std::string>* modified_policies)
     : handler_(handler), profile_(profile), weak_ptr_factory_(this) {
   global_network_config_.MergeDictionary(&global_network_config);
   remaining_policies_.swap(*modified_policies);
-  for (GuidToPolicyMap::const_iterator it = all_policies.begin();
-       it != all_policies.end(); ++it) {
-    all_policies_.insert(std::make_pair(it->first, it->second->DeepCopy()));
+  for (auto it = all_policies.begin(); it != all_policies.end(); ++it) {

[armansito, 2016/10/04 20:30:26]

nit: "for (const auto& it : all_policies)" should work too.

[Avi (use Gerrit), 2016/10/09 18:14:52]

Done.

+    all_policies_.insert(
+        std::make_pair(it->first, it->second->CreateDeepCopy()));
   }
 }
 
 PolicyApplicator::~PolicyApplicator() {
-  base::STLDeleteValues(&all_policies_);
   VLOG(1) << "Destroying PolicyApplicator for " << profile_.userhash;
 }
 
 void PolicyApplicator::Run() {
   DBusThreadManager::Get()->GetShillProfileClient()->GetProperties(
       dbus::ObjectPath(profile_.path),
       base::Bind(&PolicyApplicator::GetProfilePropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&PolicyApplicator::GetProfilePropertiesError,
                  weak_ptr_factory_.GetWeakPtr()));
@@ skipping 258 matching lines @@
   }
   remaining_policies_.clear();
 }
 
 void PolicyApplicator::NotifyConfigurationHandlerAndFinish() {
   weak_ptr_factory_.InvalidateWeakPtrs();
   handler_->OnPoliciesApplied(profile_);
 }
 
 }  // namespace chromeos