Incomplete changes to make scoped_ptr_malloc use plain functions.

chrome/common/sqlite_utils.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 CHROME_COMMON_SQLITE_UTILS_H_
 #define CHROME_COMMON_SQLITE_UTILS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 333 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SQLStatement);
 };
 
 namespace sqlite_utils {
 
 //------------------------------------------------------------------------------
 // A scoped sqlite database that closes when it goes out of scope.
 //------------------------------------------------------------------------------
-class DBClose {
- public:
-  inline void operator()(sqlite3* x) const {
-    sqlite3_close(x);
-  }
-};
-
-typedef scoped_ptr_malloc<sqlite3, DBClose> scoped_sqlite_db_ptr;
+typedef scoped_ptr_malloc<sqlite3, FreeFnIgnoreReturn<sqlite3, sqlite3_close> >
+    scoped_sqlite_db_ptr;
 
 // Opens the DB in the file pointed to by |filepath|.  This method forces the
 // database to be in UTF-8 mode on all platforms. See
 // http://www.sqlite.org/capi3ref.html#sqlite3_open for an explanation of the
 // return value.
 int OpenSqliteDb(const FilePath& filepath, sqlite3** database);
 
 // Returns true if there is a table with the given name in the database.
 // For the version where a database name is specified, it may be NULL or the
 // empty string if no database name is necessary.
@@ skipping 29 matching lines @@
 
 }  // namespace sqlite_utils
 
 #if defined(USE_SYSTEM_SQLITE)
 // This function is a local change to sqlite3 which doesn't exist when one is
 // using the system sqlite library. Thus, we stub it out here.
 int sqlite3Preload(sqlite3* db);
 #endif
 
 #endif  // CHROME_COMMON_SQLITE_UTILS_H_