Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/history/url_database_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "app/sql/connection.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/url_database.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace history {
@@ skipping 22 matching lines @@
 
  protected:
   // Provided for URL/VisitDatabase.
   virtual sql::Connection& GetDB() {
     return db_;
   }
 
  private:
   // Test setup.
   void SetUp() {
-    FilePath temp_dir;
-    PathService::Get(base::DIR_TEMP, &temp_dir);
-    db_file_ = temp_dir.AppendASCII("URLTest.db");
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    FilePath db_file = temp_dir_.path().AppendASCII("URLTest.db");
 
-    EXPECT_TRUE(db_.Open(db_file_));
+    EXPECT_TRUE(db_.Open(db_file));
 
     // Initialize the tables for this test.
     CreateURLTable(false);
     CreateMainURLIndex();
     InitKeywordSearchTermsTable();
     CreateKeywordSearchTermsIndices();
   }
   void TearDown() {
     db_.Close();
-    file_util::Delete(db_file_, false);
   }
 
-  FilePath db_file_;
+  ScopedTempDir temp_dir_;
   sql::Connection db_;
 };
 
 // Test add and query for the URL table in the HistoryDatabase.
 TEST_F(URLDatabaseTest, AddURL) {
   // First, add two URLs.
   const GURL url1("http://www.google.com/");
   URLRow url_info1(url1);
   url_info1.set_title(UTF8ToUTF16("Google"));
   url_info1.set_visit_count(4);
@@ skipping 184 matching lines @@
   IconMappingEnumerator e;
   InitIconMappingEnumeratorForEverything(&e);
   IconMapping icon_mapping;
   ASSERT_TRUE(e.GetNextIconMapping(&icon_mapping));
   ASSERT_EQ(url1, icon_mapping.page_url);
   ASSERT_EQ(icon_id, icon_mapping.icon_id);
   ASSERT_FALSE(e.GetNextIconMapping(&icon_mapping));
 }
 
 }  // namespace history