Convert scoped_ptr_malloc -> scoped_ptr, part 2.

net/cert/x509_certificate_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/cert/x509_certificate.h"
 
 #include <blapi.h>  // Implement CalculateChainFingerprint() with NSS.
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
   system_time->wHour = exploded.hour;
   system_time->wMinute = exploded.minute;
   system_time->wSecond = exploded.second;
   system_time->wMilliseconds = exploded.millisecond;
 }
 
 //-----------------------------------------------------------------------------
 
 // Decodes the cert's subjectAltName extension into a CERT_ALT_NAME_INFO
 // structure and stores it in *output.
-void GetCertSubjectAltName(PCCERT_CONTEXT cert,
-                           scoped_ptr_malloc<CERT_ALT_NAME_INFO>* output) {
+void GetCertSubjectAltName(
+    PCCERT_CONTEXT cert,
+    scoped_ptr<CERT_ALT_NAME_INFO, base::FreeDeleter>* output) {
   PCERT_EXTENSION extension = CertFindExtension(szOID_SUBJECT_ALT_NAME2,
                                                 cert->pCertInfo->cExtension,
                                                 cert->pCertInfo->rgExtension);
   if (!extension)
     return;
 
   CRYPT_DECODE_PARA decode_para;
   decode_para.cbSize = sizeof(decode_para);
   decode_para.pfnAlloc = crypto::CryptAlloc;
   decode_para.pfnFree = crypto::CryptFree;
@@ skipping 108 matching lines @@
     std::vector<std::string>* dns_names,
     std::vector<std::string>* ip_addrs) const {
   if (dns_names)
     dns_names->clear();
   if (ip_addrs)
     ip_addrs->clear();
 
   if (!cert_handle_)
     return;
 
-  scoped_ptr_malloc<CERT_ALT_NAME_INFO> alt_name_info;
+  scoped_ptr<CERT_ALT_NAME_INFO, base::FreeDeleter> alt_name_info;
   GetCertSubjectAltName(cert_handle_, &alt_name_info);
   CERT_ALT_NAME_INFO* alt_name = alt_name_info.get();
   if (alt_name) {
     int num_entries = alt_name->cAltEntry;
     for (int i = 0; i < num_entries; i++) {
       // dNSName is an ASN.1 IA5String representing a string of ASCII
       // characters, so we can use WideToASCII here.
       const CERT_ALT_NAME_ENTRY& entry = alt_name->rgAltEntry[i];
 
       if (dns_names && entry.dwAltNameChoice == CERT_ALT_NAME_DNS_NAME) {
@@ skipping 255 matching lines @@
     if (IsCertNameBlobInIssuerList(&(*it)->pCertInfo->Issuer,
                                    valid_issuers)) {
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace net