Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/installer/util/work_item_list_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 "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/conditional_work_item_list.h"
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
 
 namespace {
 
 wchar_t test_root[] = L"ListList";
 wchar_t data_str[] = L"data_111";
 
 class WorkItemListTest : public testing::Test {
  protected:
   virtual void SetUp() {
     // Create a temporary key for testing
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
     key.DeleteKey(test_root);
     ASSERT_NE(ERROR_SUCCESS, key.Open(HKEY_CURRENT_USER, test_root, KEY_READ));
     ASSERT_EQ(ERROR_SUCCESS,
         key.Create(HKEY_CURRENT_USER, test_root, KEY_READ));
 
-    // Create a temp directory for test.
-    ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
-    test_dir_ = test_dir_.AppendASCII("WorkItemListTest");
-    file_util::Delete(test_dir_, true);
-    ASSERT_FALSE(file_util::PathExists(test_dir_));
-    file_util::CreateDirectoryW(test_dir_);
-    ASSERT_TRUE(file_util::PathExists(test_dir_));
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
   virtual void TearDown() {
     logging::CloseLogFile();
-    // Clean up test directory
-    ASSERT_TRUE(file_util::Delete(test_dir_, true));
-    ASSERT_FALSE(file_util::PathExists(test_dir_));
+
     // Clean up the temporary key
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
     ASSERT_EQ(ERROR_SUCCESS, key.DeleteKey(test_root));
   }
 
-  FilePath test_dir_;
+  ScopedTempDir temp_dir_;
 };
 
 }  // namespace
 
 // Execute a WorkItem list successfully and then rollback.
 TEST_F(WorkItemListTest, ExecutionSuccess) {
   scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
   scoped_ptr<WorkItem> work_item;
 
-  FilePath top_dir_to_create(test_dir_);
+  FilePath top_dir_to_create(temp_dir_.path());
   top_dir_to_create = top_dir_to_create.AppendASCII("a");
   FilePath dir_to_create(top_dir_to_create);
   dir_to_create = dir_to_create.AppendASCII("b");
   ASSERT_FALSE(file_util::PathExists(dir_to_create));
 
   work_item.reset(reinterpret_cast<WorkItem*>(
       WorkItem::CreateCreateDirWorkItem(dir_to_create)));
   work_item_list->AddWorkItem(work_item.release());
 
   std::wstring key_to_create(test_root);
@@ skipping 30 matching lines @@
   EXPECT_NE(ERROR_SUCCESS,
       key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ));
   EXPECT_FALSE(file_util::PathExists(top_dir_to_create));
 }
 
 // Execute a WorkItem list. Fail in the middle. Rollback what has been done.
 TEST_F(WorkItemListTest, ExecutionFailAndRollback) {
   scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
   scoped_ptr<WorkItem> work_item;
 
-  FilePath top_dir_to_create(test_dir_);
+  FilePath top_dir_to_create(temp_dir_.path());
   top_dir_to_create = top_dir_to_create.AppendASCII("a");
   FilePath dir_to_create(top_dir_to_create);
   dir_to_create = dir_to_create.AppendASCII("b");
   ASSERT_FALSE(file_util::PathExists(dir_to_create));
 
   work_item.reset(reinterpret_cast<WorkItem*>(
       WorkItem::CreateCreateDirWorkItem(dir_to_create)));
   work_item_list->AddWorkItem(work_item.release());
 
   std::wstring key_to_create(test_root);
@@ skipping 35 matching lines @@
   // Verify everything is rolled back.
   EXPECT_NE(ERROR_SUCCESS,
       key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ));
   EXPECT_FALSE(file_util::PathExists(top_dir_to_create));
 }
 
 TEST_F(WorkItemListTest, ConditionalExecutionSuccess) {
   scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
   scoped_ptr<WorkItem> work_item;
 
-  FilePath top_dir_to_create(test_dir_);
+  FilePath top_dir_to_create(temp_dir_.path());
   top_dir_to_create = top_dir_to_create.AppendASCII("a");
   FilePath dir_to_create(top_dir_to_create);
   dir_to_create = dir_to_create.AppendASCII("b");
   ASSERT_FALSE(file_util::PathExists(dir_to_create));
 
   work_item.reset(reinterpret_cast<WorkItem*>(
       WorkItem::CreateCreateDirWorkItem(dir_to_create)));
   work_item_list->AddWorkItem(work_item.release());
 
   scoped_ptr<WorkItemList> conditional_work_item_list(
@@ skipping 34 matching lines @@
   // can not be deleted.
   EXPECT_NE(ERROR_SUCCESS,
       key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ));
   EXPECT_FALSE(file_util::PathExists(top_dir_to_create));
 }
 
 TEST_F(WorkItemListTest, ConditionalExecutionConditionFailure) {
   scoped_ptr<WorkItemList> work_item_list(WorkItem::CreateWorkItemList());
   scoped_ptr<WorkItem> work_item;
 
-  FilePath top_dir_to_create(test_dir_);
+  FilePath top_dir_to_create(temp_dir_.path());
   top_dir_to_create = top_dir_to_create.AppendASCII("a");
   FilePath dir_to_create(top_dir_to_create);
   dir_to_create = dir_to_create.AppendASCII("b");
   ASSERT_FALSE(file_util::PathExists(dir_to_create));
 
   work_item.reset(reinterpret_cast<WorkItem*>(
       WorkItem::CreateCreateDirWorkItem(dir_to_create)));
   work_item_list->AddWorkItem(work_item.release());
 
   scoped_ptr<WorkItemList> conditional_work_item_list(
@@ skipping 33 matching lines @@
 
   // Verify everything is rolled back.
   // The value must have been deleted first in roll back otherwise the key
   // can not be deleted.
   EXPECT_NE(ERROR_SUCCESS,
       key.Open(HKEY_CURRENT_USER, key_to_create.c_str(), KEY_READ));
   EXPECT_FALSE(file_util::PathExists(top_dir_to_create));
 }