Index: chrome/utility/importer/edge_database_reader_win.cc |
diff --git a/chrome/utility/importer/edge_database_reader_win.cc b/chrome/utility/importer/edge_database_reader_win.cc |
index 01dfb5e039a8e9fbbac353072d25016c7c572800..dd5d45515a00ac8d54121e69e2fd73187da5dab2 100644 |
--- a/chrome/utility/importer/edge_database_reader_win.cc |
+++ b/chrome/utility/importer/edge_database_reader_win.cc |
@@ -10,6 +10,8 @@ |
#include <vector> |
+#include "base/memory/ptr_util.h" |
+ |
namespace { |
// This is an arbitary size chosen for the database error message buffer. |
@@ -241,8 +243,8 @@ bool EdgeDatabaseReader::OpenDatabase(const base::string16& database_file) { |
return true; |
} |
-scoped_ptr<EdgeDatabaseTableEnumerator> EdgeDatabaseReader::OpenTableEnumerator( |
- const base::string16& table_name) { |
+std::unique_ptr<EdgeDatabaseTableEnumerator> |
+EdgeDatabaseReader::OpenTableEnumerator(const base::string16& table_name) { |
JET_TABLEID table_id; |
if (!IsOpen()) { |
@@ -254,6 +256,6 @@ scoped_ptr<EdgeDatabaseTableEnumerator> EdgeDatabaseReader::OpenTableEnumerator( |
nullptr, 0, JET_bitTableReadOnly, &table_id))) |
return nullptr; |
- return make_scoped_ptr( |
+ return base::WrapUnique( |
new EdgeDatabaseTableEnumerator(table_name, session_id_, table_id)); |
} |