Split DownloadFile::Rename into RenameAndUniquify and RenameAndAnnotate.

content/public/test/test_file_error_injector.cc

 // 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.
 
 #include "content/public/test/test_file_error_injector.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 31 matching lines @@
       const ConstructionCallback& ctor_callback,
       const DestructionCallback& dtor_callback);
 
   ~DownloadFileWithErrors();
 
   virtual void Initialize(const InitializeCallback& callback) OVERRIDE;
 
   // DownloadFile interface.
   virtual DownloadInterruptReason AppendDataToFile(
       const char* data, size_t data_len) OVERRIDE;
-  virtual void Rename(const FilePath& full_path,
-                      bool overwrite_existing_file,
-                      const RenameCompletionCallback& callback) OVERRIDE;
+  virtual void RenameAndUniquify(
+      const FilePath& full_path,
+      const RenameCompletionCallback& callback) OVERRIDE;
+  virtual void RenameAndAnnotate(
+      const FilePath& full_path,
+      const RenameCompletionCallback& callback) OVERRIDE;
 
  private:
   // Error generating helper.
   DownloadInterruptReason ShouldReturnError(
       TestFileErrorInjector::FileOperationCode code,
       DownloadInterruptReason original_error);
 
   // Determine whether to overwrite an operation with the given code
   // with a substitute error; if returns true, |*original_error| is
   // written with the error to use for overwriting.
@@ skipping 78 matching lines @@
   DownloadFileImpl::Initialize(callback_to_use);
 }
 
 DownloadInterruptReason DownloadFileWithErrors::AppendDataToFile(
     const char* data, size_t data_len) {
   return ShouldReturnError(
       TestFileErrorInjector::FILE_OPERATION_WRITE,
       DownloadFileImpl::AppendDataToFile(data, data_len));
 }
 
-void DownloadFileWithErrors::Rename(
+void DownloadFileWithErrors::RenameAndUniquify(
     const FilePath& full_path,
-    bool overwrite_existing_file,
     const RenameCompletionCallback& callback) {
   DownloadInterruptReason error_to_return = DOWNLOAD_INTERRUPT_REASON_NONE;
   RenameCompletionCallback callback_to_use = callback;
 
   // Replace callback if the error needs to be overwritten.
   if (OverwriteError(
-          TestFileErrorInjector::FILE_OPERATION_RENAME,
+          TestFileErrorInjector::FILE_OPERATION_RENAME_UNIQUIFY,
           &error_to_return)) {
     callback_to_use = base::Bind(&RenameErrorCallback, callback,
                                  error_to_return);
   }
 
-  DownloadFileImpl::Rename(full_path, overwrite_existing_file, callback_to_use);
+  DownloadFileImpl::RenameAndUniquify(full_path, callback_to_use);
+}
+
+void DownloadFileWithErrors::RenameAndAnnotate(
+    const FilePath& full_path,
+    const RenameCompletionCallback& callback) {
+  DownloadInterruptReason error_to_return = DOWNLOAD_INTERRUPT_REASON_NONE;
+  RenameCompletionCallback callback_to_use = callback;
+
+  // Replace callback if the error needs to be overwritten.
+  if (OverwriteError(
+          TestFileErrorInjector::FILE_OPERATION_RENAME_ANNOTATE,
+          &error_to_return)) {
+    callback_to_use = base::Bind(&RenameErrorCallback, callback,
+                                 error_to_return);
+  }
+
+  DownloadFileImpl::RenameAndAnnotate(full_path, callback_to_use);
 }
 
 bool DownloadFileWithErrors::OverwriteError(
     TestFileErrorInjector::FileOperationCode code,
     DownloadInterruptReason* output_error) {
   int counter = operation_counter_[code]++;
 
   if (code != error_info_.code)
     return false;
 
@@ skipping 229 matching lines @@
   return single_injector;
 }
 
 // static
 std::string TestFileErrorInjector::DebugString(FileOperationCode code) {
   switch (code) {
     case FILE_OPERATION_INITIALIZE:
       return "INITIALIZE";
     case FILE_OPERATION_WRITE:
       return "WRITE";
-    case FILE_OPERATION_RENAME:
-      return "RENAME";
+    case FILE_OPERATION_RENAME_UNIQUIFY:
+      return "RENAME_UNIQUIFY";
+    case FILE_OPERATION_RENAME_ANNOTATE:
+      return "RENAME_ANNOTATE";
     default:
       break;
   }
 
   return "Unknown";
 }
 
 }  // namespace content