| Index: net/dns/dns_config_service_win_unittest.cc
|
| diff --git a/net/dns/dns_config_service_win_unittest.cc b/net/dns/dns_config_service_win_unittest.cc
|
| index 3f3e4ed1e3758a34b7844dab51b96923421dd90b..7ac01d1e536fd1e431c85e74f77dcc9a96ee60fa 100644
|
| --- a/net/dns/dns_config_service_win_unittest.cc
|
| +++ b/net/dns/dns_config_service_win_unittest.cc
|
| @@ -58,7 +58,7 @@ struct AdapterInfo {
|
| int ports[4];
|
| };
|
|
|
| -scoped_ptr_malloc<IP_ADAPTER_ADDRESSES> CreateAdapterAddresses(
|
| +scoped_ptr<IP_ADAPTER_ADDRESSES, base::FreeDeleter> CreateAdapterAddresses(
|
| const AdapterInfo* infos) {
|
| size_t num_adapters = 0;
|
| size_t num_addresses = 0;
|
| @@ -72,8 +72,8 @@ scoped_ptr_malloc<IP_ADAPTER_ADDRESSES> CreateAdapterAddresses(
|
| size_t heap_size = num_adapters * sizeof(IP_ADAPTER_ADDRESSES) +
|
| num_addresses * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) +
|
| sizeof(struct sockaddr_storage));
|
| - scoped_ptr_malloc<IP_ADAPTER_ADDRESSES> heap(
|
| - reinterpret_cast<IP_ADAPTER_ADDRESSES*>(malloc(heap_size)));
|
| + scoped_ptr<IP_ADAPTER_ADDRESSES, base::FreeDeleter> heap(
|
| + static_cast<IP_ADAPTER_ADDRESSES*>(malloc(heap_size)));
|
| CHECK(heap.get());
|
| memset(heap.get(), 0, heap_size);
|
|
|
|
|