Convert scoped_ptr_malloc -> scoped_ptr, part 2.

net/dns/address_sorter_win.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/address_sorter.h"
 
 #include <winsock2.h>
 
 #include <algorithm>
 
@@ skipping 106 matching lines @@
                                                      ipe.port());
           }
           list.push_back(ipe);
         }
       }
       callback_.Run(success_, list);
     }
 
     const CallbackType callback_;
     const size_t buffer_size_;
-    scoped_ptr_malloc<SOCKET_ADDRESS_LIST> input_buffer_;
-    scoped_ptr_malloc<SOCKET_ADDRESS_LIST> output_buffer_;
+    scoped_ptr<SOCKET_ADDRESS_LIST, base::FreeDeleter> input_buffer_;
+    scoped_ptr<SOCKET_ADDRESS_LIST, base::FreeDeleter> output_buffer_;
     bool success_;
 
     DISALLOW_COPY_AND_ASSIGN(Job);
   };
 
   DISALLOW_COPY_AND_ASSIGN(AddressSorterWin);
 };
 
 // Merges |list_ipv4| and |list_ipv6| before passing it to |callback|, but
 // only if |success| is true.
@@ skipping 50 matching lines @@
 
 // static
 scoped_ptr<AddressSorter> AddressSorter::CreateAddressSorter() {
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return scoped_ptr<AddressSorter>(new AddressSorterWinXP());
   return scoped_ptr<AddressSorter>(new AddressSorterWin());
 }
 
 }  // namespace net