Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/history/visit_database_unittest.cc

-// Copyright (c) 2009 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/path_service.h"
 #include "base/string_util.h"
+#include "base/memory/scoped_temp_dir.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/history/visit_database.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 using base::Time;
 using base::TimeDelta;
 
 namespace history {
 
@@ skipping 15 matching lines @@
                           public URLDatabase,
                           public VisitDatabase {
  public:
   VisitDatabaseTest() {
   }
 
  private:
   // Test setup.
   void SetUp() {
     PlatformTest::SetUp();
-    FilePath temp_dir;
-    PathService::Get(base::DIR_TEMP, &temp_dir);
-    db_file_ = temp_dir.AppendASCII("VisitTest.db");
-    file_util::Delete(db_file_, false);
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    FilePath db_file = temp_dir_.path().AppendASCII("VisitTest.db");
 
-    EXPECT_TRUE(db_.Open(db_file_));
+    EXPECT_TRUE(db_.Open(db_file));
 
     // Initialize the tables for this test.
     CreateURLTable(false);
     CreateMainURLIndex();
     InitVisitTable();
   }
   void TearDown() {
     db_.Close();
-    file_util::Delete(db_file_, false);
     PlatformTest::TearDown();
   }
 
   // Provided for URL/VisitDatabase.
   virtual sql::Connection& GetDB() {
     return db_;
   }
 
-  FilePath db_file_;
+  ScopedTempDir temp_dir_;
   sql::Connection db_;
 };
 
 TEST_F(VisitDatabaseTest, Add) {
   // Add one visit.
   VisitRow visit_info1(1, Time::Now(), 0, PageTransition::LINK, 0);
   EXPECT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED));
 
   // Add second visit for the same page.
   VisitRow visit_info2(visit_info1.url_id,
@@ skipping 174 matching lines @@
   EXPECT_EQ(SOURCE_SYNCED, sources[matches[0].visit_id]);
 
   ASSERT_TRUE(GetVisitsForURL(113, &matches));
   ASSERT_EQ(1U, matches.size());
   GetVisitsSource(matches, &sources);
   ASSERT_EQ(1U, sources.size());
   EXPECT_EQ(SOURCE_EXTENSION, sources[matches[0].visit_id]);
 }
 
 }  // namespace history