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

Unified Diff: sandbox/linux/suid/client/setuid_sandbox_client.cc

Issue 2094913002: Make base::Environment::Create() return unique_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit, rebase Created 4 years, 6 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 | « sandbox/linux/suid/client/setuid_sandbox_client.h ('k') | sandbox/linux/suid/client/setuid_sandbox_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/suid/client/setuid_sandbox_client.cc
diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
index 12ef7f9f40a0b5383d67e030d5d09becda38decf..ca73d46444e12e386fbd9bed5c99fbcad382ed71 100644
--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
+++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
@@ -10,6 +10,7 @@
#include <unistd.h>
#include <string>
+#include <utility>
#include "base/environment.h"
#include "base/files/scoped_file.h"
@@ -62,13 +63,12 @@ int GetIPCDescriptor(base::Environment* env) {
namespace sandbox {
SetuidSandboxClient* SetuidSandboxClient::Create() {
- base::Environment* environment(base::Environment::Create());
- CHECK(environment);
- return new SetuidSandboxClient(environment);
+ return new SetuidSandboxClient(base::Environment::Create());
}
-SetuidSandboxClient::SetuidSandboxClient(base::Environment* env)
- : env_(env), sandboxed_(false) {
+SetuidSandboxClient::SetuidSandboxClient(std::unique_ptr<base::Environment> env)
+ : env_(std::move(env)), sandboxed_(false) {
+ DCHECK(env_);
}
SetuidSandboxClient::~SetuidSandboxClient() {
« no previous file with comments | « sandbox/linux/suid/client/setuid_sandbox_client.h ('k') | sandbox/linux/suid/client/setuid_sandbox_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698