Remove stl_util's deletion functions from chromeos/.

chromeos/network/policy_util.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_POLICY_UTIL_H_
 #define CHROMEOS_NETWORK_POLICY_UTIL_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
-
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 
 struct NetworkProfile;
 
 namespace policy_util {
 
-typedef std::map<std::string, const base::DictionaryValue*> GuidToPolicyMap;
+using GuidToPolicyMap =
+    std::map<std::string, std::unique_ptr<base::DictionaryValue>>;
 
 // Creates a managed ONC dictionary from the given arguments. Depending on the
 // profile type, the policies are assumed to come from the user or device policy
 // and and |user_settings| to be the user's non-shared or shared settings.
 // Each of the arguments can be NULL.
 // TODO(pneubeck): Add documentation of the returned format, see
 //   https://crbug.com/408990 .
 std::unique_ptr<base::DictionaryValue> CreateManagedONC(
     const base::DictionaryValue* global_policy,
     const base::DictionaryValue* network_policy,
     const base::DictionaryValue* user_settings,
     const base::DictionaryValue* active_settings,
     const NetworkProfile* profile);
 
 // Adds properties to |shill_properties_to_update|, which are enforced on an
-// unamaged network by the global config |global_network_policy| of the policy.
+// unmanaged network by the global config |global_network_policy| of the policy.
 // |shill_dictionary| are the network's current properties read from Shill.
 void SetShillPropertiesForGlobalPolicy(
     const base::DictionaryValue& shill_dictionary,
     const base::DictionaryValue& global_network_policy,
     base::DictionaryValue* shill_properties_to_update);
 
 // Creates a Shill property dictionary from the given arguments. The resulting
 // dictionary will be sent to Shill by the caller. Depending on the profile
 // type, |network_policy| is interpreted as the user or device policy and
 // |user_settings| as the user or shared settings. |network_policy| or
@@ skipping 10 matching lines @@
 // NetworkConfiguration.
 const base::DictionaryValue* FindMatchingPolicy(
     const GuidToPolicyMap& policies,
     const base::DictionaryValue& actual_network);
 
 }  // namespace policy_util
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_POLICY_UTIL_H_