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

Unified Diff: chrome/utility/importer/edge_database_reader_win.cc

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months 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
« no previous file with comments | « chrome/utility/importer/edge_database_reader_win.h ('k') | chrome/utility/importer/edge_importer_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
}
« no previous file with comments | « chrome/utility/importer/edge_database_reader_win.h ('k') | chrome/utility/importer/edge_importer_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698