Index: chrome/utility/importer/edge_database_reader_win.h |
diff --git a/chrome/utility/importer/edge_database_reader_win.h b/chrome/utility/importer/edge_database_reader_win.h |
index 1b87801358b637fef6d2d99cf59adacf261d6bb9..5f0e2ff8ef98255c1211abe5e676b5ca76700881 100644 |
--- a/chrome/utility/importer/edge_database_reader_win.h |
+++ b/chrome/utility/importer/edge_database_reader_win.h |
@@ -7,12 +7,13 @@ |
#define JET_UNICODE |
#include <esent.h> |
+ |
+#include <memory> |
Lei Zhang
2016/04/19 01:35:43
Move this down to after line 14.
dcheng
2016/04/19 03:51:33
Done.
|
#undef JET_UNICODE |
#include <map> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/string16.h" |
class EdgeErrorObject { |
@@ -79,7 +80,7 @@ class EdgeDatabaseReader : public EdgeErrorObject { |
bool OpenDatabase(const base::string16& database_file); |
// Open a row enumerator for a specified table. Returns a nullptr on error. |
- scoped_ptr<EdgeDatabaseTableEnumerator> OpenTableEnumerator( |
+ std::unique_ptr<EdgeDatabaseTableEnumerator> OpenTableEnumerator( |
const base::string16& table_name); |
private: |