DownloadFile no longer keeps track of whether or not the final rename has occurred.

chrome/browser/download/download_file_manager.h

Index: chrome/browser/download/download_file_manager.h
diff --git a/chrome/browser/download/download_file_manager.h b/chrome/browser/download/download_file_manager.h
index 461b08d93822be6750674139d192f7fd351fb7cf..a0abc99fef0474a7f24094160cead7e116139307 100644
--- a/chrome/browser/download/download_file_manager.h
+++ b/chrome/browser/download/download_file_manager.h
@@ -126,13 +126,22 @@ class DownloadFileManager
   // on the FILE thread.
   void CancelDownloadOnRename(int id);
 
+  // Erases the download file with the given the download |id| and removes
+  // it from the maps.
+  void EraseDownload(int id);
+
   // Unique ID for each DownloadFile.
   int next_id_;
 
-  // A map of all in progress downloads.
   typedef base::hash_map<int, DownloadFile*> DownloadFileMap;
+
+  // A map of all in progress downloads.  It owns the download files,
+  // although they may also show up in |downloads_with_final_name_|.
   DownloadFileMap downloads_;
 
+  // download files are owned by |downloads_|.
+  DownloadFileMap downloads_with_final_name_;
+
   // Schedule periodic updates of the download progress. This timer
   // is controlled from the FILE thread, and posts updates to the UI thread.
   base::RepeatingTimer<DownloadFileManager> update_timer_;