Fix file leaks in a ETW test and a ScopedTempDir test.

base/scoped_temp_dir_unittest.cc

 // Copyright (c) 2011 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 <string>
+
 #include "base/file_util.h"
 #include "base/platform_file.h"
 #include "base/scoped_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(ScopedTempDir, FullPath) {
   FilePath test_path;
   file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("scoped_temp_dir"),
                                     &test_path);
 
@@ skipping 38 matching lines @@
     FilePath tmp_dir;
     EXPECT_TRUE(file_util::GetTempDir(&tmp_dir));
     EXPECT_TRUE(test_path.value().find(tmp_dir.value()) != std::string::npos);
   }
   EXPECT_FALSE(file_util::DirectoryExists(test_path));
 }
 
 TEST(ScopedTempDir, UniqueTempDirUnderPath) {
   // Create a path which will contain a unique temp path.
   FilePath base_path;
-  file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("base_dir"),
-                                    &base_path);
+  ASSERT_TRUE(file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("base_dir"),
+                                                &base_path));
 
   FilePath test_path;
   {
     ScopedTempDir dir;
     EXPECT_TRUE(dir.CreateUniqueTempDirUnderPath(base_path));
     test_path = dir.path();
     EXPECT_TRUE(file_util::DirectoryExists(test_path));
     EXPECT_TRUE(base_path.IsParent(test_path));
     EXPECT_TRUE(test_path.value().find(base_path.value()) != std::string::npos);
   }
   EXPECT_FALSE(file_util::DirectoryExists(test_path));
+  file_util::Delete(base_path, true);

[Sigurður Ásgeirsson, 2011/12/16 13:59:45]

how ironic :).

[Nico, 2011/12/16 16:29:05]

+1

 }
 
 TEST(ScopedTempDir, MultipleInvocations) {
   ScopedTempDir dir;
   EXPECT_TRUE(dir.CreateUniqueTempDir());
   EXPECT_FALSE(dir.CreateUniqueTempDir());
   EXPECT_TRUE(dir.Delete());
   EXPECT_TRUE(dir.CreateUniqueTempDir());
   EXPECT_FALSE(dir.CreateUniqueTempDir());
   ScopedTempDir other_dir;
@@ skipping 15 matching lines @@
                                                      NULL, &error_code);
   EXPECT_NE(base::kInvalidPlatformFileValue, file);
   EXPECT_EQ(base::PLATFORM_FILE_OK, error_code);
   EXPECT_FALSE(dir.Delete());  // We should not be able to delete.
   EXPECT_FALSE(dir.path().empty());  // We should still have a valid path.
   EXPECT_TRUE(base::ClosePlatformFile(file));
   // Now, we should be able to delete.
   EXPECT_TRUE(dir.Delete());
 }
 #endif  // defined(OS_WIN)