| Index: chromeos/network/managed_network_configuration_handler_impl.cc
|
| diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc
|
| index 16648c34163466dc23ec05aad6a12cb62a7f000a..8e1c910d3581355d49e2346764934bec4202cfb7 100644
|
| --- a/chromeos/network/managed_network_configuration_handler_impl.cc
|
| +++ b/chromeos/network/managed_network_configuration_handler_impl.cc
|
| @@ -422,7 +422,7 @@ void ManagedNetworkConfigurationHandlerImpl::SetPolicy(
|
| 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);
|
| @@ -515,7 +515,7 @@ bool ManagedNetworkConfigurationHandlerImpl::ApplyOrQueuePolicies(
|
| 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;
|
| }
|
|
|