1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc
index 7512786..c752d3f 100644
--- a/chrome/browser/history/history_querying_unittest.cc
+++ b/chrome/browser/history/history_querying_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -86,11 +87,9 @@ class HistoryQueryTest : public testing::Test {
 
  private:
   virtual void SetUp() {
-    FilePath temp_dir;
-    PathService::Get(base::DIR_TEMP, &temp_dir);
-    history_dir_ = temp_dir.AppendASCII("HistoryTest");
-    file_util::Delete(history_dir_, true);
-    file_util::CreateDirectory(history_dir_);
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+    history_dir_ = temp_dir_.path().AppendASCII("HistoryTest");
+    ASSERT_TRUE(file_util::CreateDirectory(history_dir_));
 
     history_ = new HistoryService;
     if (!history_->Init(history_dir_, NULL)) {
@@ -111,7 +110,7 @@ class HistoryQueryTest : public testing::Test {
 
       history_->AddPage(url, test_entries[i].time, id_scope, page_id, GURL(),
                         PageTransition::LINK, history::RedirectList(),
-                        false);
+                        history::SOURCE_BROWSED, false);
       history_->SetPageTitle(url, UTF8ToUTF16(test_entries[i].title));
       history_->SetPageContents(url, UTF8ToUTF16(test_entries[i].body));
     }
@@ -124,7 +123,6 @@ class HistoryQueryTest : public testing::Test {
       history_ = NULL;
       MessageLoop::current()->Run();  // Wait for the other thread.
     }
-    file_util::Delete(history_dir_, true);
   }
 
   void QueryHistoryComplete(HistoryService::Handle, QueryResults* results) {
@@ -132,6 +130,8 @@ class HistoryQueryTest : public testing::Test {
     MessageLoop::current()->Quit();  // Will return out to QueryHistory.
   }
 
+  ScopedTempDir temp_dir_;
+
   MessageLoop message_loop_;
 
   FilePath history_dir_;
@@ -314,7 +314,7 @@ TEST_F(HistoryQueryTest, FTSArchived) {
   row2.set_last_visit(Time::Now());
   urls_to_add.push_back(row2);
 
-  history_->AddPagesWithDetails(urls_to_add);
+  history_->AddPagesWithDetails(urls_to_add, history::SOURCE_BROWSED);
 
   QueryOptions options;
   QueryResults results;