| Index: chrome/browser/download/download_file_manager.cc
|
| diff --git a/chrome/browser/download/download_file_manager.cc b/chrome/browser/download/download_file_manager.cc
|
| index 0c200e5b004abb6e9733ff385d53c6a7f1223909..a13cfd993846b5ad86e1768211eabaf9f4534684 100644
|
| --- a/chrome/browser/download/download_file_manager.cc
|
| +++ b/chrome/browser/download/download_file_manager.cc
|
| @@ -68,8 +68,7 @@ void DownloadFileManager::CreateDownloadFile(DownloadCreateInfo* info,
|
| scoped_ptr<DownloadFile>
|
| download_file(new DownloadFile(info, download_manager));
|
| if (!download_file->Initialize(get_hash)) {
|
| - download_util::CancelDownloadRequest(resource_dispatcher_host_,
|
| - info->process_handle);
|
| + info->process_handle.CancelRequest();
|
| return;
|
| }
|
|
|
| @@ -96,9 +95,7 @@ void DownloadFileManager::ResumeDownloadRequest(
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| // This balances the pause in DownloadResourceHandler::OnResponseStarted.
|
| - resource_dispatcher_host_->PauseRequest(process.child_id(),
|
| - process.request_id(),
|
| - false);
|
| + process.PauseRequest(false);
|
| }
|
|
|
| DownloadFile* DownloadFileManager::GetDownloadFile(int id) {
|
| @@ -147,8 +144,7 @@ void DownloadFileManager::StartDownload(DownloadCreateInfo* info) {
|
|
|
| DownloadManager* manager = info->process_handle.GetDownloadManager();
|
| if (!manager) {
|
| - download_util::CancelDownloadRequest(resource_dispatcher_host_,
|
| - info->process_handle);
|
| + info->process_handle.CancelRequest();
|
| delete info;
|
| return;
|
| }
|
| @@ -269,7 +265,7 @@ void DownloadFileManager::OnDownloadManagerShutdown(DownloadManager* manager) {
|
| i != downloads_.end(); ++i) {
|
| DownloadFile* download_file = i->second;
|
| if (download_file->GetDownloadManager() == manager) {
|
| - download_file->CancelDownloadRequest(resource_dispatcher_host_);
|
| + download_file->CancelDownloadRequest();
|
| to_remove.insert(download_file);
|
| }
|
| }
|
| @@ -384,7 +380,7 @@ void DownloadFileManager::CancelDownloadOnRename(int id) {
|
| // Without a download manager, we can't cancel the request normally, so we
|
| // need to do it here. The normal path will also update the download
|
| // history before cancelling the request.
|
| - download_file->CancelDownloadRequest(resource_dispatcher_host_);
|
| + download_file->CancelDownloadRequest();
|
| return;
|
| }
|
|
|
|
|