Replace all usage of FileAutoDeleter with ScopedTempDir.

chrome/browser/importer/safari_importer_unittest.mm

 // 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 "chrome/browser/importer/safari_importer.h"
 
 #include "app/sql/connection.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/test/file_test_utils.h"
 #include "testing/platform_test.h"
 
 // In order to test the Safari import functionality effectively, we store a
 // simulated Library directory containing dummy data files in the same
 // structure as ~/Library in the Chrome test data directory.
 // This function returns the path to that directory.
 FilePath GetTestSafariLibraryPath() {
     FilePath test_dir;
     PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
 
@@ skipping 122 matching lines @@
 TEST_F(SafariImporterTest, CanImport) {
   uint16 items = importer::NONE;
   EXPECT_TRUE(SafariImporter::CanImport(GetTestSafariLibraryPath(), &items));
   EXPECT_EQ(items, importer::HISTORY | importer::FAVORITES);
   EXPECT_EQ(items & importer::COOKIES, importer::NONE);
   EXPECT_EQ(items & importer::PASSWORDS, importer::NONE);
   EXPECT_EQ(items & importer::SEARCH_ENGINES, importer::NONE);
   EXPECT_EQ(items & importer::HOME_PAGE, importer::NONE);
 
   // Check that we don't import anything from a bogus library directory.
-  FilePath fake_library_dir;
-  file_util::CreateNewTempDirectory("FakeSafariLibrary", &fake_library_dir);
-  FileAutoDeleter deleter(fake_library_dir);
-  EXPECT_FALSE(SafariImporter::CanImport(fake_library_dir, &items));
+  ScopedTempDir fake_library_dir;
+  ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());
+  EXPECT_FALSE(SafariImporter::CanImport(fake_library_dir.path(), &items));
 }