| Index: chrome/browser/download/download_item.cc
|
| diff --git a/chrome/browser/download/download_item.cc b/chrome/browser/download/download_item.cc
|
| index 293e64c9064fe53fc864a2e488139053d5a26bbe..2f8b72ca4f1289cf4e77c2db1060c600210c075c 100644
|
| --- a/chrome/browser/download/download_item.cc
|
| +++ b/chrome/browser/download/download_item.cc
|
| @@ -225,6 +225,10 @@ DownloadItem::~DownloadItem() {
|
| download_manager_->AssertQueueStateConsistent(this);
|
| }
|
|
|
| +DownloadId DownloadItem::gid() const {
|
| + return DownloadId(download_manager_, id());
|
| +}
|
| +
|
| void DownloadItem::AddObserver(Observer* observer) {
|
| // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
|
| CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| @@ -644,7 +648,7 @@ void DownloadItem::OnDownloadCompleting(DownloadFileManager* file_manager) {
|
| if (NeedsRename()) {
|
| BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
|
| NewRunnableMethod(file_manager,
|
| - &DownloadFileManager::RenameCompletingDownloadFile, id(),
|
| + &DownloadFileManager::RenameCompletingDownloadFile, gid(),
|
| GetTargetFilePath(), safety_state() == SAFE));
|
| return;
|
| }
|
| @@ -652,9 +656,8 @@ void DownloadItem::OnDownloadCompleting(DownloadFileManager* file_manager) {
|
| DCHECK(!is_extension_install());
|
| Completed();
|
|
|
| - BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
|
| - NewRunnableMethod(file_manager, &DownloadFileManager::CompleteDownload,
|
| - id()));
|
| + BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, NewRunnableMethod(
|
| + file_manager, &DownloadFileManager::CompleteDownload, gid()));
|
| }
|
|
|
| void DownloadItem::OnDownloadRenamedToFinalName(const FilePath& full_path) {
|
|
|