Convert scoped_ptr_malloc -> scoped_ptr, part 2.

net/dns/dns_config_service_win_unittest.cc

 // Copyright (c) 2012 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 "net/dns/dns_config_service_win.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/win/windows_version.h"
 #include "net/dns/dns_protocol.h"
@@ skipping 40 matching lines @@
 }
 
 struct AdapterInfo {
   IFTYPE if_type;
   IF_OPER_STATUS oper_status;
   const WCHAR* dns_suffix;
   std::string dns_server_addresses[4];  // Empty string indicates end.
   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;
   for (size_t i = 0; infos[i].if_type; ++i) {
     ++num_adapters;
     for (size_t j = 0; !infos[i].dns_server_addresses[j].empty(); ++j) {
       ++num_addresses;
     }
   }
 
   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);
 
   IP_ADAPTER_ADDRESSES* adapters = heap.get();
   IP_ADAPTER_DNS_SERVER_ADDRESS* addresses =
       reinterpret_cast<IP_ADAPTER_DNS_SERVER_ADDRESS*>(adapters + num_adapters);
   struct sockaddr_storage* storage =
       reinterpret_cast<struct sockaddr_storage*>(addresses + num_addresses);
 
   for (size_t i = 0; i < num_adapters; ++i) {
@@ skipping 371 matching lines @@
     EXPECT_EQ(t.unhandled_options, config.unhandled_options);
     EXPECT_EQ(t.have_nrpt, config.use_local_ipv6);
   }
 }
 
 
 }  // namespace
 
 }  // namespace net