Index: net/proxy/dhcp_proxy_script_fetcher_win.cc |
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.cc b/net/proxy/dhcp_proxy_script_fetcher_win.cc |
index 037268f03a094c7ec7e7754c1ab1e8975878b8b6..54e2bdfcb7104632a3c678694f52e1c500b4bbc0 100644 |
--- a/net/proxy/dhcp_proxy_script_fetcher_win.cc |
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.cc |
@@ -320,14 +320,13 @@ bool DhcpProxyScriptFetcherWin::GetCandidateAdapterNames( |
// The GetAdaptersAddresses MSDN page recommends using a size of 15000 to |
// avoid reallocation. |
ULONG adapters_size = 15000; |
- scoped_ptr_malloc<IP_ADAPTER_ADDRESSES> adapters; |
+ scoped_ptr<IP_ADAPTER_ADDRESSES, base::FreeDeleter> adapters; |
ULONG error = ERROR_SUCCESS; |
int num_tries = 0; |
base::ElapsedTimer time_api_access; |
do { |
- adapters.reset( |
- reinterpret_cast<IP_ADAPTER_ADDRESSES*>(malloc(adapters_size))); |
+ adapters.reset(static_cast<IP_ADAPTER_ADDRESSES*>(malloc(adapters_size))); |
// Return only unicast addresses, and skip information we do not need. |
error = GetAdaptersAddresses(AF_UNSPEC, |
GAA_FLAG_SKIP_ANYCAST | |