Reduced the lifetime of DownloadCreateInfo.

chrome/browser/history/download_create_info.h

 // 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.
 //
 // Download creation struct used for querying the history service.
 
 #ifndef CHROME_BROWSER_HISTORY_DOWNLOAD_CREATE_INFO_H_
 #define CHROME_BROWSER_HISTORY_DOWNLOAD_CREATE_INFO_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/time.h"
 #include "chrome/browser/download/download_file.h"
 #include "chrome/browser/download/download_process_handle.h"
 #include "googleurl/src/gurl.h"
 
+class DownloadItem;
+
+// Contains the information that is stored in the History database (or refers
+// to it).
+struct DownloadHistoryInfo {

[Paweł Hajdan Jr., 2011/05/18 20:20:33]

Could you extract this to its own header file? The point is to make it easy to
find.

[ahendrickson, 2011/05/19 13:51:38]

Done.

+  DownloadHistoryInfo();
+  explicit DownloadHistoryInfo(const DownloadItem& item);
+  DownloadHistoryInfo(const std::vector<GURL>& url,
+                      const GURL& referrer,
+                      int64 total_bytes);
+  DownloadHistoryInfo(const FilePath& path,
+                      const GURL& url,
+                      const base::Time& start,
+                      int64 received,
+                      int64 total,
+                      int32 download_state);
+  DownloadHistoryInfo(const FilePath& path,
+                      const std::vector<GURL>& url,
+                      const GURL& referrer,
+                      const base::Time& start,
+                      int64 received,
+                      int64 total,
+                      int32 download_state,
+                      int64 handle,
+                      int32 id);
+
+  // The URL from which we are downloading. This is the final URL after any
+  // redirection by the server for |url_chain|.
+  const GURL& url() const;
+
+  // Download ID assigned by DownloadResourceHandler.
+  // Used by the history back end, to return in a callback.
+  int32 download_id;
+
+  // The final path where the download is saved.
+  FilePath path;
+
+  // The chain of redirects that leading up to and including the final URL.
+  std::vector<GURL> url_chain;
+
+  // The URL that referred us.
+  GURL referrer_url;
+
+  base::Time start_time;
+
+  int64 received_bytes;
+
+  int64 total_bytes;
+
+  int32 state;
+
+  int64 db_handle;
+};
+
 // Used for informing the download database of a new download, where we don't
 // want to pass DownloadItems between threads. The history service also uses a
 // vector of these structs for passing us the state of all downloads at
 // initialization time (see DownloadQueryInfo below).
 struct DownloadCreateInfo {
   DownloadCreateInfo(const FilePath& path,
                      const GURL& url,
                      base::Time start_time,
                      int64 received_bytes,
                      int64 total_bytes,
@@ skipping 20 matching lines @@
   FilePath suggested_path;
   // A number that should be added to the suggested path to make it unique.
   // 0 means no number should be appended.  Not actually stored in the db.
   int path_uniquifier;
   base::Time start_time;
   int64 received_bytes;
   int64 total_bytes;
   int32 state;
   int32 download_id;
   bool has_user_gesture;
+  // The handle to the process information.  Used for operations outside the
+  // download system.
   DownloadProcessHandle process_handle;
   int64 db_handle;
   std::string content_disposition;
   std::string mime_type;
   // The value of the content type header sent with the downloaded item.  It
   // may be different from |mime_type|, which may be set based on heuristics
   // which may look at the file extension and first few bytes of the file.
   std::string original_mime_type;
 
   // True if we should display the 'save as...' UI and prompt the user
@@ skipping 10 matching lines @@
   // Whether this download is for extension install or not.
   bool is_extension_install;
   // The charset of the referring page where the download request comes from.
   // It's used to construct a suggested filename.
   std::string referrer_charset;
   // The download file save info.
   DownloadSaveInfo save_info;
 };
 
 #endif  // CHROME_BROWSER_HISTORY_DOWNLOAD_CREATE_INFO_H_