Replacing base::DIR_TEMP with ScopedTempDir when appropriate.

chrome/browser/history/text_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 <string>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.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/text_database.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 using base::Time;
 
 namespace history {
@@ skipping 65 matching lines @@
 }
 
 }  // namespace
 
 class TextDatabaseTest : public PlatformTest {
  public:
   TextDatabaseTest() {}
 
  protected:
   void SetUp() {
-    PlatformTest::SetUp();
-    PathService::Get(base::DIR_TEMP, &temp_path_);
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());

[Paweł Hajdan Jr., 2011/04/08 15:58:17]

Make sure to call PlatformTest::SetUp(), that call shouldn't be removed!

[Mike West, 2011/04/11 14:47:04]

Yup, I hit `d` too many times.  Good catch!  :)

   }
 
   void TearDown() {
     for (size_t i = 0; i < opened_files_.size(); i++)

[Paweł Hajdan Jr., 2011/04/08 15:58:17]

Can we get rid of this TearDown then? And maybe opened_files_ too.

[Mike West, 2011/04/11 14:47:04]

Done.

       file_util::Delete(opened_files_[i], false);
     file_util::Delete(file_name_, false);
     PlatformTest::TearDown();
   }
 
   // Create databases with this function, which will ensure that the files are
   // deleted on shutdown. Only open one database for each file. Returns NULL on
   // failure.
   //
   // Set |delete_file| to delete any existing file. If we are trying to create
   // the file for the first time, we don't want a previous test left in a
   // weird state to have left a file that would affect us.
   TextDatabase* CreateDB(TextDatabase::DBIdent id,
                          bool allow_create,
                          bool delete_file) {
-    TextDatabase* db = new TextDatabase(temp_path_, id, allow_create);
+    TextDatabase* db = new TextDatabase(temp_dir_.path(), id, allow_create);
 
     if (delete_file)
       file_util::Delete(db->file_name(), false);
 
     if (!db->Init()) {
       delete db;
       return NULL;
     }
     opened_files_.push_back(db->file_name());
     return db;
   }
 
   // Directory containing the databases.
-  FilePath temp_path_;
+  ScopedTempDir temp_dir_;
 
   // Name of the main database file.
   FilePath file_name_;
 
   std::vector<FilePath> opened_files_;
 };
 
 TEST_F(TextDatabaseTest, AttachDetach) {
   // First database with one page.
   const int kIdee1 = 200801;
@@ skipping 36 matching lines @@
   URLID id3 = db->AddPageData(
       Time::FromInternalValue(kTime3), kURL3, kTitle3, kBody3);
   EXPECT_NE(0, id3);
   EXPECT_EQ(3, RowCount(db.get()));
 
   // Make sure we can delete some of the data.
   db->DeletePageData(Time::FromInternalValue(kTime1), kURL1);
   EXPECT_EQ(2, RowCount(db.get()));
 
   // Close and reopen.
-  db.reset(new TextDatabase(temp_path_, kIdee1, false));
+  db.reset(new TextDatabase(temp_dir_.path(), kIdee1, false));
   EXPECT_TRUE(db->Init());
 
   // Verify that the deleted ID is gone and try to delete another one.
   EXPECT_EQ(2, RowCount(db.get()));
   db->DeletePageData(Time::FromInternalValue(kTime2), kURL2);
   EXPECT_EQ(1, RowCount(db.get()));
 }
 
 TEST_F(TextDatabaseTest, Query) {
   // Make a database with some pages.
@@ skipping 124 matching lines @@
 
   // There should be one result, the most recent one.
   EXPECT_EQ(1U, results.size());
   EXPECT_TRUE(ResultsHaveURL(results, kURL2));
 
   // The max time considered should be the date of the returned item.
   EXPECT_EQ(kTime2, first_time_searched.ToInternalValue());
 }
 
 }  // namespace history