Clean-up temporary files/folders in firefox importer tests.

chrome/browser/importer/firefox_importer_unittest.cc

 // Copyright (c) 2006-2008 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/test/file_test_utils.h"
 
 using base::Time;
 
 TEST(FirefoxImporterTest, Firefox2NSS3Decryptor) {
   std::wstring nss_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &nss_path));
   file_util::AppendToPath(&nss_path, L"firefox2_nss");
   std::wstring db_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &db_path));
   file_util::AppendToPath(&db_path, L"firefox2_profile");
@@ skipping 117 matching lines @@
   EXPECT_EQ(L"", post_data);
   EXPECT_TRUE(Time() == add_date);
 }
 
 // Tests basic functionality and verifies that the lock file is deleted after
 // use.
 TEST(FirefoxImporterTest, ProfileLock) {
   std::wstring test_path;
   file_util::CreateNewTempDirectory(L"firefox_profile", &test_path);
   FilePath lock_file_path = FilePath::FromWStringHack(test_path);
+  FileAutoDeleter deleter(lock_file_path);
   lock_file_path = lock_file_path.Append(FirefoxProfileLock::kLockFileName);
 
   scoped_ptr<FirefoxProfileLock> lock;
   EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock.get());
   EXPECT_FALSE(file_util::PathExists(lock_file_path));
   lock.reset(new FirefoxProfileLock(test_path));
   EXPECT_TRUE(lock->HasAcquired());
   EXPECT_TRUE(file_util::PathExists(lock_file_path));
   lock->Unlock();
   EXPECT_FALSE(lock->HasAcquired());
   EXPECT_FALSE(file_util::PathExists(lock_file_path));
   lock->Lock();
   EXPECT_TRUE(lock->HasAcquired());
   EXPECT_TRUE(file_util::PathExists(lock_file_path));
   lock->Lock();
   EXPECT_TRUE(lock->HasAcquired());
   lock->Unlock();
   EXPECT_FALSE(lock->HasAcquired());
   EXPECT_FALSE(file_util::PathExists(lock_file_path));
 }
 
 // If for some reason the lock file is left behind by the previous owner, we
 // should still be able to lock it, at least in the Windows implementation.
 TEST(FirefoxImporterTest, ProfileLockOrphaned) {
   std::wstring test_path;
   file_util::CreateNewTempDirectory(L"firefox_profile", &test_path);
   FilePath lock_file_path = FilePath::FromWStringHack(test_path);
+  FileAutoDeleter deleter(lock_file_path);
   lock_file_path = lock_file_path.Append(FirefoxProfileLock::kLockFileName);
 
   // Create the orphaned lock file.
   FILE* lock_file = file_util::OpenFile(lock_file_path, "w");
   ASSERT_TRUE(lock_file);
   file_util::CloseFile(lock_file);
   EXPECT_TRUE(file_util::PathExists(lock_file_path));
 
   scoped_ptr<FirefoxProfileLock> lock;
   EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock.get());
   lock.reset(new FirefoxProfileLock(test_path));
   EXPECT_TRUE(lock->HasAcquired());
   lock->Unlock();
   EXPECT_FALSE(lock->HasAcquired());
 }
 
 // Tests two locks contending for the same lock file.
 TEST(FirefoxImporterTest, ProfileLockContention) {
   std::wstring test_path;
   file_util::CreateNewTempDirectory(L"firefox_profile", &test_path);
+  FileAutoDeleter deleter(FilePath::FromWStringHack(test_path));
 
   scoped_ptr<FirefoxProfileLock> lock1;
   EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock1.get());
   lock1.reset(new FirefoxProfileLock(test_path));
   EXPECT_TRUE(lock1->HasAcquired());
 
   scoped_ptr<FirefoxProfileLock> lock2;
   EXPECT_EQ(static_cast<FirefoxProfileLock*>(NULL), lock2.get());
   lock2.reset(new FirefoxProfileLock(test_path));
   EXPECT_FALSE(lock2->HasAcquired());
 
   lock1->Unlock();
   EXPECT_FALSE(lock1->HasAcquired());
 
   lock2->Lock();
   EXPECT_TRUE(lock2->HasAcquired());
   lock2->Unlock();
   EXPECT_FALSE(lock2->HasAcquired());
 }