Play better with C++11 library features from /chromeos

chromeos/network/managed_network_configuration_handler_impl.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/managed_network_configuration_handler_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/guid.h"
@@ skipping 404 matching lines @@
           << ".";
 
   // |userhash| must be empty for device policies.
   DCHECK(onc_source != ::onc::ONC_SOURCE_DEVICE_POLICY ||
          userhash.empty());
   Policies* policies = NULL;
   if (ContainsKey(policies_by_user_, userhash)) {
     policies = policies_by_user_[userhash].get();
   } else {
     policies = new Policies;
-    policies_by_user_[userhash] = make_linked_ptr(policies);
+    policies_by_user_[userhash] = make_scoped_ptr(policies);
   }
 
   policies->global_network_config.MergeDictionary(&global_network_config);
 
   // Update prohibited technologies.
   const base::ListValue* prohibited_list = nullptr;
   if (policies->global_network_config.GetListWithoutPathExpansion(
           ::onc::global_network_config::kDisableNetworkTypes,
           &prohibited_list) &&
       prohibited_technologies_handler_) {
@@ skipping 72 matching lines @@
 
   const Policies* policies = policies_by_user_[userhash].get();
   DCHECK(policies);
 
   PolicyApplicator* applicator =
       new PolicyApplicator(*profile,
                            policies->per_network_config,
                            policies->global_network_config,
                            this,
                            modified_policies);
-  policy_applicators_[userhash] = make_linked_ptr(applicator);
+  policy_applicators_[userhash] = make_scoped_ptr(applicator);
   applicator->Run();
   return true;
 }
 
 void ManagedNetworkConfigurationHandlerImpl::OnProfileAdded(
     const NetworkProfile& profile) {
   VLOG(1) << "Adding profile " << profile.ToDebugString() << "'.";
 
   const Policies* policies = GetPoliciesForProfile(profile);
   if (!policies) {
@@ skipping 330 matching lines @@
     scoped_ptr<base::DictionaryValue> network_properties,
     GetDevicePropertiesCallback send_callback,
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR("Error getting device properties", service_path);
   send_callback.Run(service_path, network_properties.Pass());
 }
 
 
 }  // namespace chromeos