Make passing of DownloadRequestHandle separate from DownloadCreateInfo.

content/browser/download/download_file_manager.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 "content/browser/download/download_file_manager.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/download/download_buffer.h"
+#include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file.h"
-#include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_manager.h"
+#include "content/browser/download/download_request_handle.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/download_manager_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/io_buffer.h"
 
 namespace {
 
 // Throttle updates to the UI thread so that a fast moving download doesn't
 // cause it to become unresponsive (in milliseconds).
@@ skipping 15 matching lines @@
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &DownloadFileManager::OnShutdown));
 }
 
 void DownloadFileManager::OnShutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   StopUpdateTimer();
   STLDeleteValues(&downloads_);
 }
 
-void DownloadFileManager::CreateDownloadFile(DownloadCreateInfo* info,
-                                             DownloadManager* download_manager,
-                                             bool get_hash) {
+void DownloadFileManager::CreateDownloadFile(
+    DownloadCreateInfo* info, const DownloadRequestHandle& request_handle,
+    DownloadManager* download_manager, bool get_hash) {
   DCHECK(info);
   VLOG(20) << __FUNCTION__ << "()" << " info = " << info->DebugString();
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Life of |info| ends here. No more references to it after this method.
   scoped_ptr<DownloadCreateInfo> infop(info);
 
   scoped_ptr<DownloadFile>
-      download_file(new DownloadFile(info, download_manager));
+      download_file(new DownloadFile(info, request_handle, download_manager));
   if (net::OK != download_file->Initialize(get_hash)) {
-    info->request_handle.CancelRequest();
+    request_handle.CancelRequest();
     return;
   }
 
   DownloadId global_id(download_manager, info->download_id);
   DCHECK(GetDownloadFile(global_id) == NULL);
   downloads_[global_id] = download_file.release();
 
   // The file is now ready, we can un-pause the request and start saving data.
-  info->request_handle.ResumeRequest();
+  request_handle.ResumeRequest();
 
   StartUpdateTimer();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(download_manager,
                         &DownloadManager::StartDownload, info->download_id));
 }
 
 DownloadFile* DownloadFileManager::GetDownloadFile(DownloadId global_id) {
@@ skipping 23 matching lines @@
     DownloadFile* download_file = i->second;
     DownloadManager* manager = download_file->GetDownloadManager();
     if (manager) {
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
           NewRunnableMethod(manager, &DownloadManager::UpdateDownload,
                             global_id.local(), download_file->bytes_so_far()));
     }
   }
 }
 
-void DownloadFileManager::StartDownload(DownloadCreateInfo* info) {
+void DownloadFileManager::StartDownload(
+    DownloadCreateInfo* info, const DownloadRequestHandle& request_handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(info);
 
-  DownloadManager* manager = info->request_handle.GetDownloadManager();
+  DownloadManager* manager = request_handle.GetDownloadManager();
   if (!manager) {
-    info->request_handle.CancelRequest();
+    request_handle.CancelRequest();
     delete info;
     return;
   }
 
   // TODO(phajdan.jr): fix the duplication of path info below.
   info->path = info->save_info.file_path;
 
-  manager->CreateDownloadItem(info);
+  manager->CreateDownloadItem(info, request_handle);
   bool hash_needed = manager->delegate()->GenerateFileHash();
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &DownloadFileManager::CreateDownloadFile,
-                        info, make_scoped_refptr(manager), hash_needed));
+                        info, request_handle, make_scoped_refptr(manager),
+                        hash_needed));
 }
 
 // We don't forward an update to the UI thread here, since we want to throttle
 // the UI update rate via a periodic timer. If the user has cancelled the
 // download (in the UI thread), we may receive a few more updates before the IO
 // thread gets the cancel message: we just delete the data since the
 // DownloadFile has been deleted.
 void DownloadFileManager::UpdateDownload(
     DownloadId global_id, content::DownloadBuffer* buffer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
@@ skipping 279 matching lines @@
            << " id = " << global_id
            << " download_file = " << download_file->DebugString();
 
   downloads_.erase(global_id);
 
   delete download_file;
 
   if (downloads_.empty())
     StopUpdateTimer();
 }