Incomplete changes to make scoped_ptr_malloc use plain functions.

base/crypto/scoped_nss_types.h

 // 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.
 
 #ifndef BASE_SCOPED_NSS_TYPES_H_
 #define BASE_SCOPED_NSS_TYPES_H_
 
 #include <nss.h>
 #include <pk11pub.h>
 
 #include "base/scoped_ptr.h"
 
 namespace base {
 
-template <typename Type, void (*Destroyer)(Type*)>
-struct NSSDestroyer {
-  void operator()(Type* ptr) const {
-    if (ptr)
-      Destroyer(ptr);
-  }
-};
-
 template <typename Type, void (*Destroyer)(Type*, PRBool), PRBool freeit>
-struct NSSDestroyer1 {
-  void operator()(Type* ptr) const {
-    if (ptr)
-      Destroyer(ptr, freeit);
-  }
-};
+void NSSDestroyer1(Type* ptr) {
+  Destroyer(ptr, freeit);
+}
 
 // Define some convenient scopers around NSS pointers.
 typedef scoped_ptr_malloc<
     PK11Context, NSSDestroyer1<PK11Context,
                                PK11_DestroyContext,
                                PR_TRUE> > ScopedPK11Context;
-typedef scoped_ptr_malloc<
-    PK11SlotInfo, NSSDestroyer<PK11SlotInfo, PK11_FreeSlot> > ScopedPK11Slot;
-typedef scoped_ptr_malloc<
-    PK11SymKey, NSSDestroyer<PK11SymKey, PK11_FreeSymKey> > ScopedPK11SymKey;
+typedef scoped_ptr_malloc<PK11SlotInfo, PK11_FreeSlot> ScopedPK11Slot;
+typedef scoped_ptr_malloc<PK11SymKey, PK11_FreeSymKey> ScopedPK11SymKey;
 typedef scoped_ptr_malloc<
     SECAlgorithmID, NSSDestroyer1<SECAlgorithmID,
                                   SECOID_DestroyAlgorithmID,
                                   PR_TRUE> > ScopedSECAlgorithmID;
 typedef scoped_ptr_malloc<
     SECItem, NSSDestroyer1<SECItem,
                            SECITEM_FreeItem,
                            PR_TRUE> > ScopedSECItem;
 
 }  // namespace base
 
 #endif  // BASE_SCOPED_NSS_TYPES_H_