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

Unified Diff: components/leveldb/leveldb_service_impl.cc

Issue 1918083002: Convert //components/[f-n]* 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 | « components/leveldb/leveldb_mojo_proxy.cc ('k') | components/leveldb_proto/leveldb_database.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/leveldb/leveldb_service_impl.cc
diff --git a/components/leveldb/leveldb_service_impl.cc b/components/leveldb/leveldb_service_impl.cc
index 9c4a540f8752659c9a0bf233f3fa439321469e9c..80ee829ddba108e5c749e69d1ce8df8e5304a07f 100644
--- a/components/leveldb/leveldb_service_impl.cc
+++ b/components/leveldb/leveldb_service_impl.cc
@@ -4,6 +4,9 @@
#include "components/leveldb/leveldb_service_impl.h"
+#include <memory>
+
+#include "base/memory/ptr_util.h"
#include "components/leveldb/env_mojo.h"
#include "components/leveldb/leveldb_database_impl.h"
#include "components/leveldb/public/cpp/util.h"
@@ -50,7 +53,7 @@ void LevelDBServiceImpl::OpenWithOptions(
LevelDBMojoProxy::OpaqueDir* dir =
thread_->RegisterDirectory(std::move(directory));
- scoped_ptr<MojoEnv> env_mojo(new MojoEnv(thread_, dir));
+ std::unique_ptr<MojoEnv> env_mojo(new MojoEnv(thread_, dir));
options.env = env_mojo.get();
leveldb::DB* db = nullptr;
@@ -58,7 +61,7 @@ void LevelDBServiceImpl::OpenWithOptions(
if (s.ok()) {
new LevelDBDatabaseImpl(std::move(database), std::move(env_mojo),
- scoped_ptr<leveldb::DB>(db));
+ base::WrapUnique(db));
}
callback.Run(LeveldbStatusToError(s));
@@ -70,7 +73,8 @@ void LevelDBServiceImpl::OpenInMemory(leveldb::LevelDBDatabaseRequest database,
options.create_if_missing = true;
options.max_open_files = 0; // Use minimum.
- scoped_ptr<leveldb::Env> env(leveldb::NewMemEnv(leveldb::Env::Default()));
+ std::unique_ptr<leveldb::Env> env(
+ leveldb::NewMemEnv(leveldb::Env::Default()));
options.env = env.get();
leveldb::DB* db = nullptr;
@@ -78,7 +82,7 @@ void LevelDBServiceImpl::OpenInMemory(leveldb::LevelDBDatabaseRequest database,
if (s.ok()) {
new LevelDBDatabaseImpl(std::move(database), std::move(env),
- scoped_ptr<leveldb::DB>(db));
+ base::WrapUnique(db));
}
callback.Run(LeveldbStatusToError(s));
« no previous file with comments | « components/leveldb/leveldb_mojo_proxy.cc ('k') | components/leveldb_proto/leveldb_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698