Check for cancel in DownloadManager::OnAllDataSaved().

chrome/browser/download/download_manager.cc

 // Copyright (c) 2011 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 "base/callback.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 491 matching lines @@
       UpdateAppIcon();  // Reflect size updates.
       download_history_->UpdateEntry(download);
     }
   }
 }
 
 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);
 
   MaybeCompleteDownload(download);
 }
 
 bool DownloadManager::IsDownloadReadyForCompletion(DownloadItem* download) {
   // If we don't have all the data, the download is not ready for
   // completion.
   if (!download->all_data_saved())
@@ skipping 602 matching lines @@
     observed_download_manager_->RemoveObserver(this);
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ModelChanged() {
   observing_download_manager_->NotifyModelChanged();
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ManagerGoingDown() {
   observed_download_manager_ = NULL;
 }