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

content/browser/download/download_item.h

 // 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.
 //
 // Each download is represented by a DownloadItem, and all DownloadItems
 // are owned by the DownloadManager which maintains a global list of all
 // downloads. DownloadItems are created when a user initiates a download,
 // and exist for the duration of the browser life time.
 //
 // Download observers:
@@ skipping 152 matching lines @@
   // exit to prevent this crash. This may result in a difference between the
   // downloaded file's size on disk, and what the history system's last record
   // of it is. At worst, we'll end up re-downloading a small portion of the file
   // when resuming a download (assuming the server supports byte ranges).
   void Cancel(bool update_history);
 
   // Called by external code (SavePackage) using the DownloadItem interface
   // to display progress when the DownloadItem should be considered complete.
   void MarkAsComplete();
 
-  // Called by the delegate after it delayed completing the download in 
+  // Called by the delegate after it delayed completing the download in
   // DownloadManagerDelegate::ShouldCompleteDownload.
   void CompleteDelayedDownload();
 
   // Called when all data has been saved. Only has display effects.
   void OnAllDataSaved(int64 size);
 
   // Called when the downloaded file is removed.
   void OnDownloadedFileRemoved();
 
   // Download operation had an error.
@@ skipping 131 matching lines @@
   // Returns the user-verified target file path for the download.
   // This returns the same path as GetTargetFilePath() for safe downloads
   // but does not for dangerous downloads until the name is verified.
   FilePath GetUserVerifiedFilePath() const;
 
   // Returns true if the current file name is not the final target name yet.
   bool NeedsRename() const {
     return state_info_.target_name != full_path_.BaseName();
   }
 
+  // Cancels the off-thread aspects of the download.
+  // TODO(rdsmith): This should be private and only called from
+  // DownloadItem::Cancel/Interrupt; it isn't now because we can't
+  // call those functions from
+  // DownloadManager::FileSelectionCancelled() without doing some
+  // rewrites of the DownloadManager queues.
+  void OffThreadCancel(DownloadFileManager* file_manager);
+
   std::string DebugString(bool verbose) const;
 
 #ifdef UNIT_TEST
   // Mock opening downloads (for testing only).
   void TestMockDownloadOpen() { open_enabled_ = false; }
 #endif
 
  private:
   // Construction common to all constructors. |active| should be true for new
   // downloads and false for downloads from the history.
@@ skipping 132 matching lines @@
   // only.
   bool open_enabled_;
 
   // Did the delegate delay calling Complete on this download?
   bool delegate_delayed_complete_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItem);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_H_