Make base::Environment::Create() return unique_ptrs.

sandbox/linux/suid/client/setuid_sandbox_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sandbox/linux/suid/client/setuid_sandbox_client.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include <string>
+#include <utility>
 
 #include "base/environment.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/string_number_conversions.h"
 #include "sandbox/linux/suid/common/sandbox.h"
 
 namespace {
 
@@ skipping 32 matching lines @@
 // Get the IPC file descriptor used to communicate with the setuid helper.
 int GetIPCDescriptor(base::Environment* env) {
   return EnvToInt(env, sandbox::kSandboxDescriptorEnvironmentVarName);
 }
 
 }  // namespace
 
 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() {
 }
 
 void SetuidSandboxClient::CloseDummyFile() {
   // When we're launched through the setuid sandbox, SetupLaunchOptions
   // arranges for kZygoteIdFd to be a dummy file descriptor to satisfy an
   // ancient setuid sandbox ABI requirement. However, the descriptor is no
   // longer needed, so we can simply close it right away now.
@@ skipping 60 matching lines @@
 
 bool SetuidSandboxClient::IsInNewNETNamespace() const {
   return env_->HasVar(kSandboxNETNSEnvironmentVarName);
 }
 
 bool SetuidSandboxClient::IsSandboxed() const {
   return sandboxed_;
 }
 
 }  // namespace sandbox