Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/history/starred_url_database_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 <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/starred_url_database.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace history {
 
 class StarredURLDatabaseTest : public testing::Test,
                                public StarredURLDatabase {
@@ skipping 38 matching lines @@
     return StarredURLDatabase::GetStarredEntry(star_id, entry);
   }
 
   bool EnsureStarredIntegrity() {
     return StarredURLDatabase::EnsureStarredIntegrity();
   }
 
  private:
   // Test setup.
   void SetUp() {
-    PathService::Get(base::DIR_TEMP, &db_file_);
-    db_file_ = db_file_.AppendASCII("VisitTest.db");
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    db_file_ = temp_dir_.path().AppendASCII("VisitTest.db");
     file_util::Delete(db_file_, false);
 
     // Copy db file over that contains starred table.
     FilePath old_history_path;
     PathService::Get(chrome::DIR_TEST_DATA, &old_history_path);
     old_history_path = old_history_path.AppendASCII("bookmarks");
     old_history_path = old_history_path.Append(
         FILE_PATH_LITERAL("History_with_empty_starred"));
     file_util::CopyFile(old_history_path, db_file_);
 
     EXPECT_TRUE(db_.Open(db_file_));
 
     // Initialize the tables for this test.
     CreateURLTable(false);
     CreateMainURLIndex();
     EnsureStarredIntegrity();
   }
   void TearDown() {
     db_.Close();
-    file_util::Delete(db_file_, false);
   }
 
   // Provided for URL/StarredURLDatabase.
   virtual sql::Connection& GetDB() {
     return db_;
   }
 
+  ScopedTempDir temp_dir_;
   FilePath db_file_;
   sql::Connection db_;
 };
 
 //-----------------------------------------------------------------------------
 
 TEST_F(StarredURLDatabaseTest, FixOrphanedFolder) {
   const int initial_count = GetStarredEntryCount();
 
   // Create a folder that isn't parented to the other/bookmark folders.
@@ skipping 169 matching lines @@
   DeleteURLRow(entry.url_id);
 
   // Fix up the table.
   ASSERT_TRUE(EnsureStarredIntegrity());
 
   // The entry we just created should have been nuked.
   ASSERT_EQ(initial_count, GetStarredEntryCount());
 }
 
 }  // namespace history