Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: sql/mojo/vfs_unittest.cc

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address more comments Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sql/mojo/vfs_unittest.cc
diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc
index 123299bfe9b8a4f2a6ab37d664cd7d0da772c76a..ceb4bf4bcd86dec5ec958ad8ba1d515cb95eaa43 100644
--- a/sql/mojo/vfs_unittest.cc
+++ b/sql/mojo/vfs_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
brettw 2015/11/18 00:21:52 Blank line after this.
dcheng 2015/11/18 18:12:16 Done.
#include "components/filesystem/public/interfaces/file_system.mojom.h"
#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/application/public/cpp/application_test_base.h"
@@ -10,12 +11,12 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/sqlite/sqlite3.h"
-namespace base {
+namespace std {
// This deleter lets us be safe with sqlite3 objects, which aren't really the
// structs, but slabs of new uint8_t[size].
template <>
-struct DefaultDeleter<sqlite3_file> {
+struct default_delete<sqlite3_file> {
inline void operator()(sqlite3_file* ptr) const {
// Why don't we call file->pMethods->xClose() here? Because it's not
// guaranteed to be valid. sqlite3_file "objects" can be in partially
@@ -24,7 +25,7 @@ struct DefaultDeleter<sqlite3_file> {
}
};
-} // namespace base
+} // namespace std
namespace sql {
« rlz/lib/rlz_lib.cc ('K') | « rlz/lib/rlz_lib.cc ('k') | ui/accessibility/ax_node_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698