Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/installer/util/delete_tree_work_item_unittest.cc

Index: chrome/installer/util/delete_tree_work_item_unittest.cc
diff --git a/chrome/installer/util/delete_tree_work_item_unittest.cc b/chrome/installer/util/delete_tree_work_item_unittest.cc
index 3215d57b07e4d2986facda590425cbfb005d6db8..d0c6c7e6e2ea12137be1d0af7cba42e1503e54a2 100644
--- a/chrome/installer/util/delete_tree_work_item_unittest.cc
+++ b/chrome/installer/util/delete_tree_work_item_unittest.cc
@@ -23,24 +23,14 @@ namespace {
    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.
@@ -60,7 +50,7 @@ namespace {
 // 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));
@@ -112,7 +102,7 @@ TEST_F(DeleteTreeWorkItemTest, DeleteTreeNoKeyPath) {
 // 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));
@@ -162,7 +152,7 @@ TEST_F(DeleteTreeWorkItemTest, DeleteTree) {
 // 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));