Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/installer/util/delete_tree_work_item_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 <windows.h>
 
 #include <fstream>
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "chrome/installer/util/delete_tree_work_item.h"
 #include "chrome/installer/util/work_item.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
   class DeleteTreeWorkItemTest : public testing::Test {
    protected:
     virtual void SetUp() {
       // Name a subdirectory of the user temp directory.

[Paweł Hajdan Jr., 2011/04/08 15:58:17]

nit: This comment seems weird now.

[Mike West, 2011/04/11 14:47:04]

Done.

-      ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
-      test_dir_ = test_dir_.AppendASCII("DeleteTreeWorkItemTest");
-
-      // Create a fresh, empty copy of this test directory.
-      file_util::Delete(test_dir_, true);
-      file_util::CreateDirectoryW(test_dir_);
-
-      ASSERT_TRUE(file_util::PathExists(test_dir_));
+      ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     }
 
     virtual void TearDown() {

[Paweł Hajdan Jr., 2011/04/08 15:58:17]

Empty TearDown can be removed.

[Mike West, 2011/04/11 14:47:04]

Done.

-      // Clean up test directory
-      ASSERT_TRUE(file_util::Delete(test_dir_, true));
-      ASSERT_FALSE(file_util::PathExists(test_dir_));
     }
 
     // the path to temporary directory used to contain the test operations
-    FilePath test_dir_;
+    ScopedTempDir temp_dir_;
   };
 
   // Simple function to dump some text into a new file.
   void CreateTextFile(const std::wstring& filename,
                       const std::wstring& contents) {
     std::ofstream file;
     file.open(filename.c_str());
     ASSERT_TRUE(file.is_open());
     file << contents;
     file.close();
   }
 
   wchar_t text_content_1[] = L"delete me";
   wchar_t text_content_2[] = L"delete me as well";
 };
 
 // Delete a tree without key path. Everything should be deleted.
 TEST_F(DeleteTreeWorkItemTest, DeleteTreeNoKeyPath) {
   // Create tree to be deleted
-  FilePath dir_name_delete(test_dir_);
+  FilePath dir_name_delete(temp_dir_.path());
   dir_name_delete = dir_name_delete.AppendASCII("to_be_delete");
   file_util::CreateDirectory(dir_name_delete);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete));
 
   FilePath dir_name_delete_1(dir_name_delete);
   dir_name_delete_1 = dir_name_delete_1.AppendASCII("1");
   file_util::CreateDirectory(dir_name_delete_1);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_1));
 
   FilePath dir_name_delete_2(dir_name_delete);
@@ skipping 31 matching lines @@
   EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_2));
   EXPECT_TRUE(file_util::PathExists(dir_name_delete));
 }
 
 
 // Delete a tree with keypath but not in use. Everything should be gone.
 // Rollback should bring back everything
 TEST_F(DeleteTreeWorkItemTest, DeleteTree) {
   // Create tree to be deleted
-  FilePath dir_name_delete(test_dir_);
+  FilePath dir_name_delete(temp_dir_.path());
   dir_name_delete = dir_name_delete.AppendASCII("to_be_delete");
   file_util::CreateDirectory(dir_name_delete);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete));
 
   FilePath dir_name_delete_1(dir_name_delete);
   dir_name_delete_1 = dir_name_delete_1.AppendASCII("1");
   file_util::CreateDirectory(dir_name_delete_1);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_1));
 
   FilePath dir_name_delete_2(dir_name_delete);
@@ skipping 29 matching lines @@
   work_item->Rollback();
   // everything should come back
   EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_2));
   EXPECT_TRUE(file_util::PathExists(dir_name_delete));
 }
 
 // Delete a tree with key_path in use. Everything should still be there.
 TEST_F(DeleteTreeWorkItemTest, DeleteTreeInUse) {
   // Create tree to be deleted
-  FilePath dir_name_delete(test_dir_);
+  FilePath dir_name_delete(temp_dir_.path());
   dir_name_delete = dir_name_delete.AppendASCII("to_be_delete");
   file_util::CreateDirectory(dir_name_delete);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete));
 
   FilePath dir_name_delete_1(dir_name_delete);
   dir_name_delete_1 = dir_name_delete_1.AppendASCII("1");
   file_util::CreateDirectory(dir_name_delete_1);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_1));
 
   FilePath dir_name_delete_2(dir_name_delete);
@@ skipping 49 matching lines @@
 
   // verify everything is still there.
   EXPECT_TRUE(file_util::PathExists(key_path));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_2));
 
   TerminateProcess(pi.hProcess, 0);
   // make sure the handle is closed.
   WaitForSingleObject(pi.hProcess, INFINITE);
 }