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

chrome/browser/importer/firefox_importer_unittest.cc

Index: chrome/browser/importer/firefox_importer_unittest.cc
===================================================================
--- chrome/browser/importer/firefox_importer_unittest.cc	(revision 16874)
+++ chrome/browser/importer/firefox_importer_unittest.cc	(working copy)
@@ -11,6 +11,7 @@
 #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;
 
@@ -148,6 +149,7 @@
   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;
@@ -175,6 +177,7 @@
   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.
@@ -195,6 +198,7 @@
 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());