Check for cancel in DownloadManager::OnAllDataSaved().

chrome/browser/download/download_manager.cc

Index: chrome/browser/download/download_manager.cc
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 7e66e505b7737a6b4a1af48844c9e8d89c58a0f2..affdf947b6a3232b085f8c40c753337c7a4b691e 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -509,7 +509,11 @@ void DownloadManager::OnAllDataSaved(int32 download_id, int64 size) {
   VLOG(20) << __FUNCTION__ << "()" << " download_id = " << download_id
            << " size = " << size;
 
-  DCHECK_EQ(1U, active_downloads_.count(download_id));
+  // If it's not in active_downloads_, that means it was cancelled; just

[Paweł Hajdan Jr., 2011/01/25 07:27:46]

How about removing the download from active_downloads_ instead?

I can't really tell which one is better, but it seems to me removing the
download would be more elegant.

+  // ignore the notification.
+  if (active_downloads_.count(download_id) == 0)
+    return;
+
   DownloadItem* download = active_downloads_[download_id];
   download->OnAllDataSaved(size);