| Index: chrome/common/sqlite_utils.h
|
| diff --git a/chrome/common/sqlite_utils.h b/chrome/common/sqlite_utils.h
|
| index 7ae6572ac4b1090dd8d0e33f92987fa72c1216d2..263178ae5884663b4f6ab5bc435dd46e5492a813 100644
|
| --- a/chrome/common/sqlite_utils.h
|
| +++ b/chrome/common/sqlite_utils.h
|
| @@ -351,14 +351,8 @@ 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
|
|
|