Replace all usage of FileAutoDeleter with ScopedTempDir.

chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc

 // Copyright (c) 2010 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/safe_browsing/safe_browsing_store_file.h"
 
 #include "base/callback.h"
+#include "base/scoped_temp_dir.h"
 #include "chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h"
-#include "chrome/test/file_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 const FilePath::CharType kFolderPrefix[] =
     FILE_PATH_LITERAL("SafeBrowsingTestStoreFile");
 
 class SafeBrowsingStoreFileTest : public PlatformTest {
  public:
   virtual void SetUp() {
     PlatformTest::SetUp();
 
-    FilePath temp_dir;
-    ASSERT_TRUE(file_util::CreateNewTempDirectory(kFolderPrefix, &temp_dir));
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
-    file_deleter_.reset(new FileAutoDeleter(temp_dir));
-
-    filename_ = temp_dir;
+    filename_ = temp_dir_.path();
     filename_ = filename_.AppendASCII("SafeBrowsingTestStore");
-    file_util::Delete(filename_, false);
-
-    // Make sure an old temporary file isn't hanging around.
-    const FilePath temp_file =
-        SafeBrowsingStoreFile::TemporaryFileForFilename(filename_);
-    file_util::Delete(temp_file, false);
+    ASSERT_FALSE(file_util::PathExists(filename_));

[Paweł Hajdan Jr., 2011/05/20 13:48:58]

nit: Not needed, please remove.

[lain Merrick, 2011/05/20 14:23:32]

Done.

 
     store_.reset(new SafeBrowsingStoreFile());
     store_->Init(filename_, NULL);
   }
   virtual void TearDown() {
     if (store_.get())
       store_->Delete();
     store_.reset();
-    file_deleter_.reset();
 
     PlatformTest::TearDown();
   }
 
   void OnCorruptionDetected() {
     corruption_detected_ = true;
   }
 
-  scoped_ptr<FileAutoDeleter> file_deleter_;
+  ScopedTempDir temp_dir_;
   FilePath filename_;
   scoped_ptr<SafeBrowsingStoreFile> store_;
   bool corruption_detected_;
 };
 
 TEST_STORE(SafeBrowsingStoreFileTest, store_.get(), filename_);
 
 // Test that Delete() deletes the temporary store, if present.
 TEST_F(SafeBrowsingStoreFileTest, DeleteTemp) {
-    const FilePath temp_file =
-        SafeBrowsingStoreFile::TemporaryFileForFilename(filename_);
+  const FilePath temp_file =
+      SafeBrowsingStoreFile::TemporaryFileForFilename(filename_);
 
   EXPECT_FALSE(file_util::PathExists(filename_));
   EXPECT_FALSE(file_util::PathExists(temp_file));
 
   // Starting a transaction creates a temporary file.
   EXPECT_TRUE(store_->BeginUpdate());
   EXPECT_TRUE(file_util::PathExists(temp_file));
 
   // Pull the rug out from under the existing store, simulating a
   // crash.
@@ skipping 64 matching lines @@
   EXPECT_EQ(fwrite(&kLargeCount, sizeof(kLargeCount), 1, file.get()), 1U);
   file.reset();
 
   // Detects corruption and fails to even begin the update.
   corruption_detected_ = false;
   EXPECT_FALSE(test_store.BeginUpdate());
   EXPECT_TRUE(corruption_detected_);
 }
 
 }  // namespace