Split DownloadFile::Rename into RenameAndUniquify and RenameAndAnnotate.

content/browser/download/download_file.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_FILE_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 11 matching lines @@
 // the download is 'in progress': once the download has been completed or
 // cancelled, the DownloadFile is destroyed.
 class CONTENT_EXPORT DownloadFile {
  public:
   // Callback used with Initialize.  On a successful initialize, |reason| will
   // be DOWNLOAD_INTERRUPT_REASON_NONE; on a failed initialize, it will be
   // set to the reason for the failure.
   typedef base::Callback<void(DownloadInterruptReason reason)>
       InitializeCallback;
 
-  // Callback used with Rename().  On a successful rename |reason| will be
+  // Callback used with Rename*().  On a successful rename |reason| will be
   // DOWNLOAD_INTERRUPT_REASON_NONE and |path| the path the rename
   // was done to.  On a failed rename, |reason| will contain the
   // error.
   typedef base::Callback<void(DownloadInterruptReason reason,
                               const FilePath& path)> RenameCompletionCallback;
 
-  // Callback used with Detach(). On success, |reason| will be
-  // DOWNLOAD_INTERRUPT_REASON_NONE.
-  typedef base::Callback<void(DownloadInterruptReason reason)>
-      DetachCompletionCallback;
-
   virtual ~DownloadFile() {}
 
   // Returns DOWNLOAD_INTERRUPT_REASON_NONE on success, or a network
   // error code on failure.  Upon completion, |callback| will be
   // called on the UI thread as per the comment above.
   virtual void Initialize(const InitializeCallback& callback) = 0;
 
-  // Rename the download file to |full_path|.  If that file exists and
-  // |overwrite_existing_file| is false, |full_path| will be uniquified by
-  // suffixing " (<number>)" to the file name before the extension.
-  // Upon completion, |callback| will be called on the UI thread
-  // as per the comment above.
-  virtual void Rename(const FilePath& full_path,
-                      bool overwrite_existing_file,
-                      const RenameCompletionCallback& callback) = 0;
+  // Rename the download file to |full_path|.  If that file exists
+  // |full_path| will be uniquified by suffixing " (<number>)" to the
+  // file name before the extension.
+  virtual void RenameAndUniquify(const FilePath& full_path,
+                                 const RenameCompletionCallback& callback) = 0;
+
+  // Rename the download file to |full_path| and annotate it with
+  // "Mark of the Web" information about its source.  No uniquification
+  // will be performed.
+  virtual void RenameAndAnnotate(const FilePath& full_path,
+                                 const RenameCompletionCallback& callback) = 0;
 
   // Detach the file so it is not deleted on destruction.
-  // |callback| will be called on the UI thread after detach.
-  virtual void Detach(const DetachCompletionCallback& callback) = 0;
+  virtual void Detach() = 0;
 
   // Abort the download and automatically close the file.
   virtual void Cancel() = 0;
 
   virtual FilePath FullPath() const = 0;
   virtual bool InProgress() const = 0;
   virtual int64 BytesSoFar() const = 0;
   virtual int64 CurrentSpeed() const = 0;
 
   // Set |hash| with sha256 digest for the file.
   // Returns true if digest is successfully calculated.
   virtual bool GetHash(std::string* hash) = 0;
 
   // Returns the current (intermediate) state of the hash as a byte string.
   virtual std::string GetHashState() = 0;
 
   // For testing.  Must be called on FILE thread.
   // TODO(rdsmith): Replace use of EnsureNoPendingDownloads()
   // on the DownloadManager with a test-specific DownloadFileFactory
   // which keeps track of the number of DownloadFiles.
   static int GetNumberOfDownloadFiles();
 
  protected:
   static int number_active_objects_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_