Reduced the lifetime of DownloadCreateInfo.

chrome/browser/history/history_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.
 
 // History unit tests come in two flavors:
 //
 // 1. The more complicated style is that the unit test creates a full history
 //    service. This spawns a background thread for the history backend, and
 //    all communication is asynchronous. This is useful for testing more
 //    complicated things or end-to-end behavior.
@@ skipping 19 matching lines @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_temp_dir.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_item.h"
-#include "chrome/browser/history/download_create_info.h"
+#include "chrome/browser/history/download_history_info.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/tools/profiles/thumbnail-inl.h"
@@ skipping 126 matching lines @@
     history_service_ = NULL;
 
     // Wait for the backend class to terminate before deleting the files and
     // moving to the next test. Note: if this never terminates, somebody is
     // probably leaking a reference to the history backend, so it never calls
     // our destroy task.
     MessageLoop::current()->Run();
   }
 
   int64 AddDownload(int32 state, const Time& time) {
-    DownloadCreateInfo download(FilePath(FILE_PATH_LITERAL("foo-path")),
-                                GURL("foo-url"), time, 0, 512, state, 0, false);
+    DownloadHistoryInfo download(FilePath(FILE_PATH_LITERAL("foo-path")),
+                                 GURL("foo-url"),
+                                 GURL(""),
+                                 time,
+                                 0,
+                                 512,
+                                 state,
+                                 0);
     return db_->CreateDownload(download);
   }
 
   // Fills the query_url_row_ and query_url_visits_ structures with the
   // information about the given URL and returns true. If the URL was not
   // found, this will return false and those structures will not be changed.
   bool QueryURL(HistoryService* history, const GURL& url) {
     history->QueryURL(url, true, &consumer_,
                       NewCallback(this, &HistoryTest::SaveURLAndQuit));
     MessageLoop::current()->Run();  // Will be exited in SaveURLAndQuit.
@@ skipping 98 matching lines @@
 }
 
 TEST_F(HistoryTest, ClearBrowsingData_Downloads) {
   CreateBackendAndDatabase();
 
   Time now = Time::Now();
   TimeDelta one_day = TimeDelta::FromDays(1);
   Time month_ago = now - TimeDelta::FromDays(30);
 
   // Initially there should be nothing in the downloads database.
-  std::vector<DownloadCreateInfo> downloads;
+  std::vector<DownloadHistoryInfo> downloads;
   db_->QueryDownloads(&downloads);
   EXPECT_EQ(0U, downloads.size());
 
   // Keep track of these as we need to update them later during the test.
   DownloadID in_progress, removing;
 
   // Create one with a 0 time.
   EXPECT_NE(0, AddDownload(DownloadItem::COMPLETE, Time()));
   // Create one for now and +/- 1 day.
   EXPECT_NE(0, AddDownload(DownloadItem::COMPLETE, now - one_day));
@@ skipping 531 matching lines @@
   history_service_ = history;
   history->ScheduleDBTask(task.get(), &request_consumer);
   request_consumer.CancelAllRequests();
   CleanupHistoryService();
   // WARNING: history has now been deleted.
   history = NULL;
   ASSERT_FALSE(task->done_invoked);
 }
 
 }  // namespace history