Made the cancel from CancelDownloadOnRename go through the full cancel path,

content/browser/download/download_manager.h

Index: content/browser/download/download_manager.h
diff --git a/content/browser/download/download_manager.h b/content/browser/download/download_manager.h
index fa8dac5b5ce7fdc1ae7fd51add04f908fe724abb..7f92423ec77346580301c35d80a2eb8dae5c0816 100644
--- a/content/browser/download/download_manager.h
+++ b/content/browser/download/download_manager.h
@@ -117,8 +117,15 @@ class DownloadManager
   void OnResponseCompleted(int32 download_id, int64 size, int os_error,
                            const std::string& hash);
 
+  // Offthread target for cancelling a particular download.  Will be a no-op
+  // if the download has already been cancelled.
+  void CancelDownload(int32 download_id);
+
+  // Called from DownloadItem to handle the DownloadManager portion of a
+  // Cancel; should not be called from other locations.
+  void DownloadCancelledInternal(DownloadItem* download);
+
   // Called from a view when a user clicks a UI button or link.
-  void DownloadCancelled(int32 download_id);
   void RemoveDownload(int64 download_handle);
 
   // Determine if the download is ready for completion, i.e. has had
@@ -278,10 +285,6 @@ class DownloadManager
   void ContinueDownloadWithPath(DownloadItem* download,
                                 const FilePath& chosen_file);
 
-  // Download cancel helper function.
-  void DownloadCancelledInternal(int download_id,
-                                 const DownloadRequestHandle& request_handle);
-
   // All data has been downloaded.
   // |hash| is sha256 hash for the downloaded file. It is empty when the hash
   // is not available.
@@ -378,6 +381,10 @@ class DownloadManager
   // Allows an embedder to control behavior. Guaranteed to outlive this object.
   DownloadManagerDelegate* delegate_;
 
+  // TODO(rdsmith): Remove when http://crbug.com/84508 is fixed.
+  // For debugging only.
+  int64 largest_db_handle_in_history_;
+
   DISALLOW_COPY_AND_ASSIGN(DownloadManager);
 };