Convert scoped_ptr_malloc -> scoped_ptr, part 1.

chrome/common/net/x509_certificate_model_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 "chrome/common/net/x509_certificate_model.h"
 
 #include <cert.h>
 #include <cms.h>
 #include <hasht.h>
 #include <keyhi.h>  // SECKEY_DestroyPrivateKey
@@ skipping 56 matching lines @@
       extension->critical.data && extension->critical.data[0] ?
           critical_label : non_critical_label;
   return criticality + "\n" +
       psm::ProcessExtensionData(SECOID_FindOIDTag(&extension->id),
                                 &extension->value);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NSS certificate export functions.
 
-class FreeNSSCMSMessage {
- public:
+struct NSSCMSMessageDeleter {
   inline void operator()(NSSCMSMessage* x) const {
     NSS_CMSMessage_Destroy(x);
   }
 };
-typedef scoped_ptr_malloc<NSSCMSMessage, FreeNSSCMSMessage>
-    ScopedNSSCMSMessage;
+typedef scoped_ptr<NSSCMSMessage, NSSCMSMessageDeleter> ScopedNSSCMSMessage;
 
 class FreeNSSCMSSignedData {
  public:
   inline void operator()(NSSCMSSignedData* x) const {
     NSS_CMSSignedData_Destroy(x);
   }
 };
 typedef scoped_ptr_malloc<NSSCMSSignedData, FreeNSSCMSSignedData>
     ScopedNSSCMSSignedData;
 
@@ skipping 312 matching lines @@
 string ProcessRawBitsSignatureWrap(X509Certificate::OSCertHandle cert_handle) {
   return ProcessRawBits(cert_handle->signatureWrap.signature.data,
                         cert_handle->signatureWrap.signature.len);
 }
 
 void RegisterDynamicOids() {
   psm::RegisterDynamicOids();
 }
 
 }  // namespace x509_certificate_model