Revert 278483 "[Downloads] Retry renames after transient failures."

trunk/src/content/browser/download/base_file.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/browser/download/base_file.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/format_macros.h"
@@ skipping 141 matching lines @@
   bound_net_log_.BeginEvent(
       net::NetLog::TYPE_DOWNLOAD_FILE_RENAMED,
       base::Bind(&FileRenamedNetLogCallback, &full_path_, &new_path));
   Close();
   base::CreateDirectory(new_path.DirName());
 
   // A simple rename wouldn't work here since we want the file to have
   // permissions / security descriptors that makes sense in the new directory.
   rename_result = MoveFileAndAdjustPermissions(new_path);
 
-  if (rename_result == DOWNLOAD_INTERRUPT_REASON_NONE)
+  if (rename_result == DOWNLOAD_INTERRUPT_REASON_NONE) {
     full_path_ = new_path;
-
-  // Re-open the file if we were still using it regardless of the interrupt
-  // reason.
-  DownloadInterruptReason open_result = DOWNLOAD_INTERRUPT_REASON_NONE;
-  if (was_in_progress)
-    open_result = Open();
+    // Re-open the file if we were still using it.
+    if (was_in_progress)
+      rename_result = Open();
+  }
 
   bound_net_log_.EndEvent(net::NetLog::TYPE_DOWNLOAD_FILE_RENAMED);
-  return rename_result == DOWNLOAD_INTERRUPT_REASON_NONE ? open_result
-                                                         : rename_result;
+  return rename_result;
 }
 
 void BaseFile::Detach() {
   detached_ = true;
   bound_net_log_.AddEvent(net::NetLog::TYPE_DOWNLOAD_FILE_DETACHED);
 }
 
 void BaseFile::Cancel() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!detached_);
@@ skipping 138 matching lines @@
   bound_net_log_.AddEvent(
       net::NetLog::TYPE_DOWNLOAD_FILE_ERROR,
       base::Bind(&FileErrorNetLogCallback, operation, error));
   return ConvertNetErrorToInterruptReason(error, DOWNLOAD_INTERRUPT_FROM_DISK);
 }
 
 DownloadInterruptReason BaseFile::LogSystemError(
     const char* operation,
     logging::SystemErrorCode os_error) {
   // There's no direct conversion from a system error to an interrupt reason.
-  base::File::Error file_error = base::File::OSErrorToFileError(os_error);
+  net::Error net_error = net::MapSystemError(os_error);
   return LogInterruptReason(
       operation, os_error,
-      ConvertFileErrorToInterruptReason(file_error));
+      ConvertNetErrorToInterruptReason(
+          net_error, DOWNLOAD_INTERRUPT_FROM_DISK));
 }
 
 DownloadInterruptReason BaseFile::LogInterruptReason(
     const char* operation,
     int os_error,
     DownloadInterruptReason reason) {
   bound_net_log_.AddEvent(
       net::NetLog::TYPE_DOWNLOAD_FILE_ERROR,
       base::Bind(&FileInterruptedNetLogCallback, operation, os_error, reason));
   return reason;
 }
 
 }  // namespace content