summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-07 17:56:42 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-07 17:56:42 +0000
commit41c53b6a7c519f738cc2653553978c89f558fe4c (patch)
treec7c5410686c2ecde4a39cd96c012e295c130307f /chrome/browser/download
parentd868e32cd6c702e335632008653a2c1b01cd13ac (diff)
downloadchromium_src-41c53b6a7c519f738cc2653553978c89f558fe4c.zip
chromium_src-41c53b6a7c519f738cc2653553978c89f558fe4c.tar.gz
chromium_src-41c53b6a7c519f738cc2653553978c89f558fe4c.tar.bz2
Revert 58374 - Fix a race condition after my latest download cleanup change.
We need to pause the download request until the on-disk file is actually created. Otherwise all data received from network would be discarded. BUG=54131 TEST=see bug Review URL: http://codereview.chromium.org/3333007 TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3307015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58717 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_file_manager.cc13
-rw-r--r--chrome/browser/download/download_file_manager.h4
2 files changed, 0 insertions, 17 deletions
diff --git a/chrome/browser/download/download_file_manager.cc b/chrome/browser/download/download_file_manager.cc
index df28bbf..3c1edf9 100644
--- a/chrome/browser/download/download_file_manager.cc
+++ b/chrome/browser/download/download_file_manager.cc
@@ -96,12 +96,6 @@ void DownloadFileManager::CreateDownloadFile(
// TODO(phajdan.jr): fix the duplication of path info below.
info->path = info->save_info.file_path;
- // The file is now ready, we can un-pause the request and start saving data.
- ChromeThread::PostTask(
- ChromeThread::IO, FROM_HERE,
- NewRunnableMethod(this, &DownloadFileManager::ResumeDownloadRequest,
- info->child_id, info->request_id));
-
StartUpdateTimer();
ChromeThread::PostTask(
@@ -110,13 +104,6 @@ void DownloadFileManager::CreateDownloadFile(
&DownloadManager::StartDownload, info));
}
-void DownloadFileManager::ResumeDownloadRequest(int child_id, int request_id) {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
-
- // This balances the pause in DownloadResourceHandler::OnResponseStarted.
- resource_dispatcher_host_->PauseRequest(child_id, request_id, false);
-}
-
DownloadFile* DownloadFileManager::GetDownloadFile(int id) {
DownloadFileMap::iterator it = downloads_.find(id);
return it == downloads_.end() ? NULL : it->second;
diff --git a/chrome/browser/download/download_file_manager.h b/chrome/browser/download/download_file_manager.h
index 9b909d9..d51d35f 100644
--- a/chrome/browser/download/download_file_manager.h
+++ b/chrome/browser/download/download_file_manager.h
@@ -130,10 +130,6 @@ class DownloadFileManager
void CreateDownloadFile(DownloadCreateInfo* info,
DownloadManager* download_manager);
- // Tells the ResourceDispatcherHost to resume a download request
- // that was paused to wait for the on-disk file to be created.
- void ResumeDownloadRequest(int child_id, int request_id);
-
// Called only on the download thread.
DownloadFile* GetDownloadFile(int id);