Incomplete changes to make scoped_ptr_malloc use plain functions.

chrome/browser/gtk/certificate_dialogs.cc

 // Copyright (c) 2010 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/browser/gtk/certificate_dialogs.h"
 
 #include <cms.h>
 #include <gtk/gtk.h>
 
 #include <vector>
@@ skipping 37 matching lines @@
 };
 
 void WriteFileOnFileThread(const FilePath& path, const std::string& data) {
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE, new Writer(path, data));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NSS certificate export functions.
 
-class FreeNSSCMSMessage {
- public:
-  inline void operator()(NSSCMSMessage* x) const {
-    NSS_CMSMessage_Destroy(x);
-  }
-};
-typedef scoped_ptr_malloc<NSSCMSMessage, FreeNSSCMSMessage>
+typedef scoped_ptr_malloc<NSSCMSMessage, NSS_CMSMessage_Destroy>
     ScopedNSSCMSMessage;
 
-class FreeNSSCMSSignedData {
- public:
-  inline void operator()(NSSCMSSignedData* x) const {
-    NSS_CMSSignedData_Destroy(x);
-  }
-};
-typedef scoped_ptr_malloc<NSSCMSSignedData, FreeNSSCMSSignedData>
+typedef scoped_ptr_malloc<NSSCMSSignedData, NSS_CMSSignedData_Destroy>
     ScopedNSSCMSSignedData;
 
 std::string GetDerString(CERTCertificate* cert) {
   return std::string(reinterpret_cast<const char*>(cert->derCert.data),
                      cert->derCert.len);
 }
 
 std::string WrapAt64(const std::string &str) {
   std::string result;
   for (size_t i = 0; i < str.size(); i += 64) {
@@ skipping 167 matching lines @@
 
 void Exporter::FileSelectionCanceled(void* params) {
   delete this;
 }
 
 } // namespace
 
 void ShowCertExportDialog(gfx::NativeWindow parent, CERTCertificate* cert) {
   new Exporter(parent, cert);
 }