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

Unified Diff: services/user/user_shell_client.cc

Issue 1910673002: Convert //services 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 | « services/user/user_shell_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/user/user_shell_client.cc
diff --git a/services/user/user_shell_client.cc b/services/user/user_shell_client.cc
index 13efc606193d33565752225c8bdfa73d8b3fdeb6..652b853e3bf12394f6f8a7e59eb342815730662c 100644
--- a/services/user/user_shell_client.cc
+++ b/services/user/user_shell_client.cc
@@ -5,6 +5,7 @@
#include "services/user/user_shell_client.h"
#include "base/bind.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "components/filesystem/lock_table.h"
#include "components/leveldb/leveldb_service_impl.h"
@@ -63,17 +64,17 @@ class UserShellClient::LevelDBServiceObjects
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
// Variables that are only accessible on the |leveldb_service_runner_| thread.
- scoped_ptr<leveldb::LevelDBService> leveldb_service_;
+ std::unique_ptr<leveldb::LevelDBService> leveldb_service_;
mojo::BindingSet<leveldb::LevelDBService> leveldb_bindings_;
DISALLOW_COPY_AND_ASSIGN(LevelDBServiceObjects);
};
-scoped_ptr<shell::ShellClient> CreateUserShellClient(
+std::unique_ptr<shell::ShellClient> CreateUserShellClient(
scoped_refptr<base::SingleThreadTaskRunner> user_service_runner,
scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner) {
- return make_scoped_ptr(new UserShellClient(std::move(user_service_runner),
- std::move(leveldb_service_runner)));
+ return base::WrapUnique(new UserShellClient(
+ std::move(user_service_runner), std::move(leveldb_service_runner)));
}
UserShellClient::UserShellClient(
« no previous file with comments | « services/user/user_shell_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698