Make passing of DownloadRequestHandle separate from DownloadCreateInfo.

content/browser/download/download_file_manager.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.
 //
 // The DownloadFileManager owns a set of DownloadFile objects, each of which
 // represent one in progress download and performs the disk IO for that
 // download. The DownloadFileManager itself is a singleton object owned by the
 // ResourceDispatcherHost.
 //
 // The DownloadFileManager uses the file_thread for performing file write
@@ skipping 31 matching lines @@
 
 #include <map>
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/timer.h"
 #include "content/browser/download/download_id.h"
-#include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/interrupt_reasons.h"
 #include "content/common/content_export.h"
 #include "net/base/net_errors.h"
 #include "ui/gfx/native_widget_types.h"
 
 struct DownloadCreateInfo;
 struct DownloadSaveInfo;
 class DownloadFile;
 class DownloadManager;
+class DownloadRequestHandle;
 class FilePath;
 class GURL;
 class ResourceDispatcherHost;
 
 namespace content {
 class DownloadBuffer;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 // Manages all in progress downloads.
 class CONTENT_EXPORT DownloadFileManager
     : public base::RefCountedThreadSafe<DownloadFileManager> {
  public:
   explicit DownloadFileManager(ResourceDispatcherHost* rdh);
 
   // Called on shutdown on the UI thread.
   void Shutdown();
 
   // Called on UI thread to make DownloadFileManager start the download.
-  void StartDownload(DownloadCreateInfo* info);
+  void StartDownload(DownloadCreateInfo* info,
+                     const DownloadRequestHandle& request_handle);
 
   // Handlers for notifications sent from the IO thread and run on the
   // FILE thread.
   void UpdateDownload(DownloadId global_id, content::DownloadBuffer* buffer);
 
   // |reason| is the reason for interruption, if one occurs.
   // |security_info| contains SSL information (cert_id, cert_status,
   // security_bits, ssl_connection_status), which can be used to
   // fine-tune the error message.  It is empty if the transaction
   // was not performed securely.
@@ skipping 42 matching lines @@
   void StartUpdateTimer();
   void StopUpdateTimer();
   void UpdateInProgressDownloads();
 
   // Clean up helper that runs on the download thread.
   void OnShutdown();
 
   // Creates DownloadFile on FILE thread and continues starting the download
   // process.
   void CreateDownloadFile(DownloadCreateInfo* info,
+                          const DownloadRequestHandle& request_handle,
                           DownloadManager* download_manager,
                           bool hash_needed);
 
   // Called only on the download thread.
   DownloadFile* GetDownloadFile(DownloadId global_id);
 
   // Called only from RenameInProgressDownloadFile and
   // RenameCompletingDownloadFile on the FILE thread.
   // |rename_error| indicates what error caused the cancel.
   void CancelDownloadOnRename(DownloadId global_id, net::Error rename_error);
@@ skipping 10 matching lines @@
   // Schedule periodic updates of the download progress. This timer
   // is controlled from the FILE thread, and posts updates to the UI thread.
   base::RepeatingTimer<DownloadFileManager> update_timer_;
 
   ResourceDispatcherHost* resource_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileManager);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_MANAGER_H_