Reduced the lifetime of DownloadCreateInfo.

chrome/browser/history/download_database.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 "chrome/browser/history/download_database.h"
 
 #include <limits>
 #include <vector>
 
 #include "app/sql/statement.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_item.h"
-#include "chrome/browser/history/download_create_info.h"
+#include "chrome/browser/history/download_history_info.h"
 
 // Download schema:
 //
 //   id             SQLite-generated primary key.
 //   full_path      Location of the download on disk.
 //   url            URL of the downloaded file.
 //   start_time     When the download was started.
 //   received_bytes Total size downloaded.
 //   total_bytes    Total size of the download.
 //   state          Identifies if this download is completed or not. Not used
@@ skipping 48 matching lines @@
       return false;
   }
   return true;
 }
 
 bool DownloadDatabase::DropDownloadTable() {
   return GetDB().Execute("DROP TABLE downloads");
 }
 
 void DownloadDatabase::QueryDownloads(
-    std::vector<DownloadCreateInfo>* results) {
+    std::vector<DownloadHistoryInfo>* results) {
   results->clear();
 
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "SELECT id, full_path, url, start_time, received_bytes, "
         "total_bytes, state "
       "FROM downloads "
       "ORDER BY start_time"));
   if (!statement)
     return;
 
   while (statement.Step()) {
-    DownloadCreateInfo info;
+    DownloadHistoryInfo info;
     info.db_handle = statement.ColumnInt64(0);
 
     info.path = ColumnFilePath(statement, 1);
-    info.url_chain.push_back(GURL(statement.ColumnString(2)));
+    info.url = GURL(statement.ColumnString(2));
     info.start_time = base::Time::FromTimeT(statement.ColumnInt64(3));
     info.received_bytes = statement.ColumnInt64(4);
     info.total_bytes = statement.ColumnInt64(5);
     info.state = statement.ColumnInt(6);
     results->push_back(info);
   }
 }
 
 bool DownloadDatabase::UpdateDownload(int64 received_bytes,
                                       int32 state,
@@ skipping 27 matching lines @@
 bool DownloadDatabase::CleanUpInProgressEntries() {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "UPDATE downloads SET state=? WHERE state=?"));
   if (!statement)
     return false;
   statement.BindInt(0, DownloadItem::CANCELLED);
   statement.BindInt(1, DownloadItem::IN_PROGRESS);
   return statement.Run();
 }
 
-int64 DownloadDatabase::CreateDownload(const DownloadCreateInfo& info) {
+int64 DownloadDatabase::CreateDownload(const DownloadHistoryInfo& info) {
   sql::Statement statement(GetDB().GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO downloads "
       "(full_path, url, start_time, received_bytes, total_bytes, state) "
       "VALUES (?, ?, ?, ?, ?, ?)"));
   if (!statement)
     return 0;
 
   BindFilePath(statement, info.path, 0);
-  statement.BindString(1, info.url().spec());
+  statement.BindString(1, info.url.spec());
   statement.BindInt64(2, info.start_time.ToTimeT());
   statement.BindInt64(3, info.received_bytes);
   statement.BindInt64(4, info.total_bytes);
   statement.BindInt(5, info.state);
 
   if (statement.Run())
     return GetDB().GetLastInsertRowId();
   return 0;
 }
 
@@ skipping 23 matching lines @@
   statement.BindInt64(
       1,
       end_time ? end_time : std::numeric_limits<int64>::max());
   statement.BindInt(2, DownloadItem::COMPLETE);
   statement.BindInt(3, DownloadItem::CANCELLED);
   statement.BindInt(4, DownloadItem::INTERRUPTED);
   statement.Run();
 }
 
 }  // namespace history