Split DownloadFile::Rename into RenameAndUniquify and RenameAndAnnotate.

content/browser/download/download_item_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 255 matching lines @@
   // DownloadItem::Completed().
   virtual void OnDownloadCompleting();
 
   // Called after the delegate has given the go-ahead to actually complete
   // the download.
   void ReadyForDownloadCompletionDone();
 
   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 if the embedder took over opening a download, to indicate that
   // the download has been opened.
   virtual void DelayedDownloadOpened(bool auto_opened);
 
   // Called when the entire download operation (including renaming etc)
   // is completed.
   void Completed();
 
   // Helper routines -----------------------------------------------------------
 
   // Indicate that an error has occurred on the download.
   virtual void Interrupt(DownloadInterruptReason reason);
 
   // Cancel the DownloadFile if we have it.
   void CancelDownloadFile();
 
   // 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);
 
   // Set the |danger_type_| and invoke obserers if necessary.
   void SetDangerType(DownloadDangerType danger_type);
 
   void SetFullPath(const FilePath& new_path);
 
   // Mapping between internal and external states.
   static DownloadState InternalToExternalState(
@@ skipping 169 matching lines @@
   const net::BoundNetLog bound_net_log_;
 
   base::WeakPtrFactory<DownloadItemImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_