Split DownloadFile::Rename into RenameAndUniquify and RenameAndAnnotate.

content/browser/download/download_item_impl.h

Index: content/browser/download/download_item_impl.h
diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h
index e0866550616cb404b2cc5e9f7f11cf7657629278..366b90ccc99cf5dfaec515c74834222f27e151ba 100644
--- a/content/browser/download/download_item_impl.h
+++ b/content/browser/download/download_item_impl.h
@@ -277,12 +277,6 @@ class CONTENT_EXPORT DownloadItemImpl
   void OnDownloadRenamedToFinalName(DownloadInterruptReason reason,
                                     const FilePath& full_path);
 
-  void ReleaseDownloadFile();
-
-  // TODO(rdsmith,asanka): Move the AnnotateWithSourceInformation() call to the
-  //     final rename and eliminate the interrupt reason callback.
-  void OnDownloadFileReleased(DownloadInterruptReason reason);
-
   // Called when the entire download operation (including renaming etc)
   // is completed.
   void Completed();
@@ -295,10 +289,6 @@ class CONTENT_EXPORT DownloadItemImpl
   // Check if a download is ready for completion.
   bool IsDownloadReadyForCompletion();
 
-  // Returns true if the download still needs to be renamed to
-  // GetTargetFilePath().
-  bool NeedsRename() const;
-
   // Call to transition state; all state transitions should go through this.
   void TransitionTo(DownloadInternalState new_state);