Fix download cancelling from the save dialog

chrome/browser/download/download_manager.cc

 // Copyright (c) 2006-2009 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 "chrome/browser/download/download_manager.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 948 matching lines @@
                                               int request_id) {
   rdh->CancelRequest(render_process_id, request_id, false);
 }
 
 void DownloadManager::DownloadCancelled(int32 download_id) {
   DownloadMap::iterator it = in_progress_.find(download_id);
   if (it == in_progress_.end())
     return;
   DownloadItem* download = it->second;
 
-  CancelDownloadRequest(download->render_process_id(), download->request_id());
-
   // Clean up will happen when the history system create callback runs if we
   // don't have a valid db_handle yet.
   if (download->db_handle() != kUninitializedHandle) {
     in_progress_.erase(it);
     UpdateHistoryForDownload(download);
   }
 
+  DownloadCancelledInternal(download_id,
+                            download->render_process_id(),
+                            download->request_id());
+}
+
+void DownloadManager::DownloadCancelledInternal(int download_id,
+                                                int render_process_id,
+                                                int request_id) {
+  // Cancel the network request.
+  CancelDownloadRequest(render_process_id, request_id);
+
   // Tell the file manager to cancel the download.
-  file_manager_->RemoveDownload(download->id(), this);  // On the UI thread
+  file_manager_->RemoveDownload(download_id, this);  // On the UI thread
   file_loop_->PostTask(FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &DownloadFileManager::CancelDownload,
-                        download->id()));
+                        download_id));
 }
 
 void DownloadManager::PauseDownload(int32 download_id, bool pause) {
   DownloadMap::iterator it = in_progress_.find(download_id);
   if (it != in_progress_.end()) {
     DownloadItem* download = it->second;
     if (pause == download->is_paused())
       return;
 
     // Inform the ResourceDispatcherHost of the new pause state.
@@ skipping 385 matching lines @@
   DownloadCreateInfo* info = reinterpret_cast<DownloadCreateInfo*>(params);
   if (info->save_as)
     last_download_path_ = path.DirName();
   ContinueStartDownload(info, path);
 }
 
 void DownloadManager::FileSelectionCanceled(void* params) {
   // The user didn't pick a place to save the file, so need to cancel the
   // download that's already in progress to the temporary location.
   DownloadCreateInfo* info = reinterpret_cast<DownloadCreateInfo*>(params);
-  file_loop_->PostTask(FROM_HERE,
-      NewRunnableMethod(file_manager_, &DownloadFileManager::CancelDownload,
-                        info->download_id));
+  DownloadCancelledInternal(info->download_id,
+                            info->render_process_id,
+                            info->request_id);
 }
 
 void DownloadManager::DeleteDownload(const FilePath& path) {
   file_loop_->PostTask(FROM_HERE, NewRunnableFunction(
       &DownloadFileManager::DeleteFile, FilePath(path)));
 }
 
 
 void DownloadManager::DangerousDownloadValidated(DownloadItem* download) {
   DCHECK_EQ(DownloadItem::DANGEROUS, download->safety_state());
@@ skipping 124 matching lines @@
 
   if (contents)
     contents->OnStartDownload(download);
 }
 
 // Clears the last download path, used to initialize "save as" dialogs.
 void DownloadManager::ClearLastDownloadPath() {
   last_download_path_ = FilePath();
 }