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

base/files/file_util_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <fstream>
 #include <set>
@@ skipping 16 matching lines @@
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <tchar.h>
 #include <winioctl.h>
-#include "base/environment.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #endif
 
 #if defined(OS_POSIX)
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #endif
 
@@ skipping 1352 matching lines @@
   // Copy the directory recursively.
   FilePath dir_name_to =
       temp_dir_.path().Append(FILE_PATH_LITERAL("Copy_To_Subdir"));
   FilePath file_name_to =
       dir_name_to.Append(FILE_PATH_LITERAL("Copy_Test_File.txt"));
 
   // Create from path with trailing separators.
 #if defined(OS_WIN)
   FilePath from_path =
       temp_dir_.path().Append(FILE_PATH_LITERAL("Copy_From_Subdir\\\\\\"));
-#elif defined (OS_POSIX)
+#elif defined(OS_POSIX)
   FilePath from_path =
       temp_dir_.path().Append(FILE_PATH_LITERAL("Copy_From_Subdir///"));
 #endif
 
   EXPECT_TRUE(CopyDirectory(from_path, dir_name_to, true));
 
   // Check everything has been copied.
   EXPECT_TRUE(PathExists(dir_name_from));
   EXPECT_TRUE(PathExists(file_name_from));
   EXPECT_TRUE(PathExists(dir_name_to));
@@ skipping 297 matching lines @@
     { FPL("c:"),                             false },
     { FPL("c:\\windows\\notepad.exe"),       false }
   };
 
   for (const auto& test_case : local_cases) {
     FilePath input(test_case.input);
     bool observed = IsOnNetworkDrive(input);
     EXPECT_EQ(test_case.expected, observed) << " input: " << input.value();
   }
 
-  Environment* env = Environment::Create();
-  ASSERT_TRUE(!!env);
-
+  std::unique_ptr<Environment> env(Environment::Create());
   // To test IsOnNetworkDrive() for remote cases, set up a file server
   // and place a file called file.txt on the server e.g.
   // \\DC01\TESTSHARE\file.txt
   // then set the two environment variables:
   // set BASE_TEST_FILE_SERVER=DC01
   // set BASE_TEST_FILE_SHARE=TESTSHARE
   if (!env->HasVar("BASE_TEST_FILE_SERVER") ||
       !env->HasVar("BASE_TEST_FILE_SHARE")) {
     return;
   }
@@ skipping 877 matching lines @@
   // Trying to close it should crash. This is important for security.
   EXPECT_DEATH(CloseWithScopedFD(fds[1]), "");
 #endif
 }
 
 #endif  // defined(OS_POSIX)
 
 }  // namespace
 
 }  // namespace base