Make cancel remove cancelled download from active queues at time of cancel.

chrome/browser/download/download_history.h

Index: chrome/browser/download/download_history.h
diff --git a/chrome/browser/download/download_history.h b/chrome/browser/download/download_history.h
index 6d6b237be327a7190d0287c89a3848ac7dd5c19a..9ef445cefc8cb6ca7e4bbe1c9206236b2c35a955 100644
--- a/chrome/browser/download/download_history.h
+++ b/chrome/browser/download/download_history.h
@@ -47,8 +47,10 @@ class DownloadHistory {
   void UpdateDownloadPath(DownloadItem* download_item,
                           const FilePath& new_path);
 
-  // Removes |download_item| from the history database.
-  void RemoveEntry(DownloadItem* download_item);
+  // Removes the download identified by |db_handle| from the history database.
+  // |db_handle| is used instead of the DownloadItem pointer to allow
+  // removal after deletion of the download item.
+  void RemoveEntry(int64 db_handle);
 
   // Removes download-related history entries in the given time range.
   void RemoveEntriesBetween(const base::Time remove_begin,