| 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 1fc9374fd73ebb5498a89743e5128c011a4e9f24..2aead19cee39f7bc86e567b9c5417b655311d1e3 100644
|
| --- a/chromeos/network/managed_network_configuration_handler_impl.cc
|
| +++ b/chromeos/network/managed_network_configuration_handler_impl.cc
|
| @@ -838,12 +838,13 @@ void ManagedNetworkConfigurationHandlerImpl::GetDeviceStateProperties(
|
| }
|
|
|
| // Convert IPConfig dictionary to a ListValue.
|
| - base::ListValue* ip_configs = new base::ListValue;
|
| + auto ip_configs = base::MakeUnique<base::ListValue>();
|
| for (base::DictionaryValue::Iterator iter(device_state->ip_configs());
|
| !iter.IsAtEnd(); iter.Advance()) {
|
| ip_configs->Append(iter.value().CreateDeepCopy());
|
| }
|
| - properties->SetWithoutPathExpansion(shill::kIPConfigsProperty, ip_configs);
|
| + properties->SetWithoutPathExpansion(shill::kIPConfigsProperty,
|
| + std::move(ip_configs));
|
| }
|
|
|
| void ManagedNetworkConfigurationHandlerImpl::GetPropertiesCallback(
|
| @@ -916,7 +917,7 @@ void ManagedNetworkConfigurationHandlerImpl::GetDevicePropertiesSuccess(
|
| const base::DictionaryValue& device_properties) {
|
| // Create a "Device" dictionary in |network_properties|.
|
| network_properties->SetWithoutPathExpansion(
|
| - shill::kDeviceProperty, device_properties.DeepCopy());
|
| + shill::kDeviceProperty, base::MakeUnique<base::Value>(device_properties));
|
| send_callback.Run(service_path, std::move(network_properties));
|
| }
|
|
|
|
|