Convert scoped_ptr_malloc -> scoped_ptr, part 2.

net/cert/x509_util_nss.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_util.h"
 #include "net/cert/x509_util_nss.h"
 
 #include <cert.h>  // Must be included before certdb.h
 #include <certdb.h>
 #include <cryptohi.h>
@@ skipping 196 matching lines @@
     X509Certificate::OSCertHandle handle =
         X509Certificate::CreateOSCertHandleFromBytes(
             reinterpret_cast<char*>(certs[i]->data), certs[i]->len);
     if (handle)
       results->push_back(handle);
   }
 
   return SECSuccess;
 }
 
-typedef scoped_ptr_malloc<
+typedef scoped_ptr<
     CERTName,
     crypto::NSSDestroyer<CERTName, CERT_DestroyName> > ScopedCERTName;
 
 // Create a new CERTName object from its encoded representation.
 // |arena| is the allocation pool to use.
 // |data| points to a DER-encoded X.509 DistinguishedName.
 // Return a new CERTName pointer on success, or NULL.
 CERTName* CreateCertNameFromEncoded(PLArenaPool* arena,
                                     const base::StringPiece& data) {
   if (!arena)
@@ skipping 401 matching lines @@
   }
 
   return new_name;
 }
 
 #endif  // defined(USE_NSS) || defined(OS_IOS)
 
 } // namespace x509_util
 
 } // namespace net