Reduced the lifetime of DownloadCreateInfo.

chrome/browser/history/history.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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_H_
 #pragma once
 
 #include <set>
 #include <vector>
 
 #include "app/sql/init_status.h"
 #include "base/basictypes.h"
 #include "base/callback_old.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/task.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "chrome/common/ref_counted_util.h"
 #include "content/browser/cancelable_request.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/page_transition_types.h"
 
 class BookmarkService;
-struct DownloadCreateInfo;
+struct DownloadHistoryInfo;
 class FilePath;
 class GURL;
 class HistoryURLProvider;
 struct HistoryURLProviderParams;
 class InMemoryURLDatabase;
 class MainPagesRequest;
 class PageUsageData;
 class PageUsageRequest;
 class Profile;
 class SkBitmap;
@@ skipping 368 matching lines @@
   // removed.
   void ExpireHistoryBetween(const std::set<GURL>& restrict_urls,
                             base::Time begin_time, base::Time end_time,
                             CancelableRequestConsumerBase* consumer,
                             ExpireHistoryCallback* callback);
 
   // Downloads -----------------------------------------------------------------
 
   // Implemented by the caller of 'CreateDownload' below, and is called when the
   // history service has created a new entry for a download in the history db.
-  typedef Callback2<DownloadCreateInfo, int64>::Type
+  typedef Callback2<int32, int64>::Type
       DownloadCreateCallback;
 
   // Begins a history request to create a new persistent entry for a download.
   // 'info' contains all the download's creation state, and 'callback' runs
   // when the history service request is complete.
-  Handle CreateDownload(const DownloadCreateInfo& info,
+  Handle CreateDownload(int32 id,
+                        const DownloadHistoryInfo& info,
                         CancelableRequestConsumerBase* consumer,
                         DownloadCreateCallback* callback);
 
   // Implemented by the caller of 'QueryDownloads' below, and is called when the
   // history service has retrieved a list of all download state. The call
-  typedef Callback1<std::vector<DownloadCreateInfo>*>::Type
+  typedef Callback1<std::vector<DownloadHistoryInfo>*>::Type
       DownloadQueryCallback;
 
   // Begins a history request to retrieve the state of all downloads in the
   // history db. 'callback' runs when the history service request is complete,
-  // at which point 'info' contains an array of DownloadCreateInfo, one per
+  // at which point 'info' contains an array of DownloadHistoryInfo, one per
   // download.
   Handle QueryDownloads(CancelableRequestConsumerBase* consumer,
                         DownloadQueryCallback* callback);
 
   // Begins a request to clean up entries that has been corrupted (because of
   // the crash, for example).
   void CleanUpInProgressEntries();
 
   // Called to update the history service about the current state of a download.
   // This is a 'fire and forget' query, so just pass the relevant state info to
@@ skipping 419 matching lines @@
   BookmarkService* bookmark_service_;
   bool no_db_;
 
   // True if needs top site migration.
   bool needs_top_sites_migration_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_H_