Revert 146162 - Move Rename functionality from DownloadFileManager to DownloadFileImple.

content/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 37 matching lines @@
       const content::TestFileErrorInjector::FileErrorInfo& error_info,
       const ConstructionCallback& ctor_callback,
       const DestructionCallback& dtor_callback);
 
   ~DownloadFileWithErrors();
 
   // DownloadFile interface.
   virtual content::DownloadInterruptReason Initialize() OVERRIDE;
   virtual content::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 content::DownloadInterruptReason Rename(
+      const FilePath& full_path) OVERRIDE;
 
  private:
   // Error generating helper.
   content::DownloadInterruptReason ShouldReturnError(
       content::TestFileErrorInjector::FileOperationCode code,
       content::DownloadInterruptReason original_error);
 
-  // Used in place of original rename callback to intercept with
-  // ShouldReturnError.
-  void RenameErrorCallback(
-    const RenameCompletionCallback& original_callback,
-    content::DownloadInterruptReason original_error,
-    const FilePath& path_result);
-
   // Source URL for the file being downloaded.
   GURL source_url_;
 
   // Our injected error.  Only one per file.
   content::TestFileErrorInjector::FileErrorInfo error_info_;
 
   // Count per operation.  0-based.
   std::map<content::TestFileErrorInjector::FileOperationCode, int>
       operation_counter_;
 
@@ skipping 34 matching lines @@
           DownloadFileImpl::Initialize());
 }
 
 content::DownloadInterruptReason DownloadFileWithErrors::AppendDataToFile(
     const char* data, size_t data_len) {
   return ShouldReturnError(
       content::TestFileErrorInjector::FILE_OPERATION_WRITE,
       DownloadFileImpl::AppendDataToFile(data, data_len));
 }
 
-void DownloadFileWithErrors::Rename(
-    const FilePath& full_path,
-    bool overwrite_existing_file,
-    const RenameCompletionCallback& callback) {
-  DownloadFileImpl::Rename(
-      full_path, overwrite_existing_file,
-      base::Bind(&DownloadFileWithErrors::RenameErrorCallback,
-                 // Unretained since this'll only be called from
-                 // the DownloadFileImpl slice of the same object.
-                 base::Unretained(this), callback));
+content::DownloadInterruptReason DownloadFileWithErrors::Rename(
+    const FilePath& full_path) {
+  return ShouldReturnError(
+      content::TestFileErrorInjector::FILE_OPERATION_RENAME,
+      DownloadFileImpl::Rename(full_path));
 }
 
 content::DownloadInterruptReason DownloadFileWithErrors::ShouldReturnError(
     content::TestFileErrorInjector::FileOperationCode code,
     content::DownloadInterruptReason original_error) {
   int counter = operation_counter_[code];
   ++operation_counter_[code];
 
   if (code != error_info_.code)
     return original_error;
 
   if (counter != error_info_.operation_instance)
     return original_error;
 
   VLOG(1) << " " << __FUNCTION__ << "()"
           << " url = '" << source_url_.spec() << "'"
           << " code = " << content::TestFileErrorInjector::DebugString(code)
           << " (" << code << ")"
           << " counter = " << counter
           << " original_error = "
           << content::InterruptReasonDebugString(original_error)
           << " (" << original_error << ")"
           << " new error = "
           << content::InterruptReasonDebugString(error_info_.error)
           << " (" << error_info_.error << ")";
 
   return error_info_.error;
 }
 
-void DownloadFileWithErrors::RenameErrorCallback(
-    const RenameCompletionCallback& original_callback,
-    content::DownloadInterruptReason original_error,
-    const FilePath& path_result) {
-  original_callback.Run(ShouldReturnError(
-      content::TestFileErrorInjector::FILE_OPERATION_RENAME,
-      original_error), path_result);
-}
-
 }  // namespace
 
 namespace content {
 
 // A factory for constructing DownloadFiles that inject errors.
 class DownloadFileWithErrorsFactory
     : public DownloadFileManager::DownloadFileFactory {
  public:
 
   DownloadFileWithErrorsFactory(
       const DownloadFileWithErrors::ConstructionCallback& ctor_callback,
       const DownloadFileWithErrors::DestructionCallback& dtor_callback);
   virtual ~DownloadFileWithErrorsFactory();
 
   // DownloadFileFactory interface.
-  virtual DownloadFile* CreateFile(
+  virtual content::DownloadFile* CreateFile(
       DownloadCreateInfo* info,
       scoped_ptr<content::ByteStreamReader> stream,
       content::DownloadManager* download_manager,
       bool calculate_hash,
       const net::BoundNetLog& bound_net_log);
 
   bool AddError(
       const TestFileErrorInjector::FileErrorInfo& error_info);
 
   void ClearErrors();
@@ skipping 245 matching lines @@
     case FILE_OPERATION_RENAME:
       return "RENAME";
     default:
       break;
   }
 
   return "Unknown";
 }
 
 }  // namespace content