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() { |