Refactor BaseFile methods to return a DownloadInterruptReason instead of a net::Error.

content/browser/download/download_file_impl.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/download_file_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 48 matching lines @@
 
 DownloadFileImpl::~DownloadFileImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   --number_active_objects_;
 }
 
 void DownloadFileImpl::Initialize(const InitializeCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   update_timer_.reset(new base::RepeatingTimer<DownloadFileImpl>());
-  net::Error net_result = file_.Initialize(default_download_directory_);
-  if (net_result != net::OK) {
+  content::DownloadInterruptReason result =
+      file_.Initialize(default_download_directory_);
+  if (result != content::DOWNLOAD_INTERRUPT_REASON_NONE) {
     BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE, base::Bind(
-            callback, content::ConvertNetErrorToInterruptReason(
-                net_result, content::DOWNLOAD_INTERRUPT_FROM_DISK)));
+        BrowserThread::UI, FROM_HERE, base::Bind(callback, result));
     return;
   }
 
   stream_reader_->RegisterCallback(
       base::Bind(&DownloadFileImpl::StreamActive, weak_factory_.GetWeakPtr()));
 
   download_start_ = base::TimeTicks::Now();
 
   // Initial pull from the straw.
   StreamActive();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(
           callback, content::DOWNLOAD_INTERRUPT_REASON_NONE));
 
   ++number_active_objects_;
 }
 
 content::DownloadInterruptReason DownloadFileImpl::AppendDataToFile(
     const char* data, size_t data_len) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!update_timer_->IsRunning()) {
     update_timer_->Start(FROM_HERE,
                          base::TimeDelta::FromMilliseconds(kUpdatePeriodMs),
                          this, &DownloadFileImpl::SendUpdate);
   }
-  return content::ConvertNetErrorToInterruptReason(
-      file_.AppendDataToFile(data, data_len),
-      content::DOWNLOAD_INTERRUPT_FROM_DISK);
+  return file_.AppendDataToFile(data, data_len);
 }
 
 void DownloadFileImpl::Rename(const FilePath& full_path,
                               bool overwrite_existing_file,
                               const RenameCompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   FilePath new_path(full_path);
   if (!overwrite_existing_file) {
     // Make the file unique if requested.
     int uniquifier =
         file_util::GetUniquePathNumber(new_path, FILE_PATH_LITERAL(""));
     if (uniquifier > 0) {
       new_path = new_path.InsertBeforeExtensionASCII(
           StringPrintf(" (%d)", uniquifier));
     }
   }
 
-  net::Error rename_error = file_.Rename(new_path);
-  content::DownloadInterruptReason reason(
-      content::DOWNLOAD_INTERRUPT_REASON_NONE);
-  if (net::OK != rename_error) {
+  content::DownloadInterruptReason reason = file_.Rename(new_path);
+  if (reason != content::DOWNLOAD_INTERRUPT_REASON_NONE) {
     // Make sure our information is updated, since we're about to
     // error out.
     SendUpdate();
 
     // Null out callback so that we don't do any more stream processing.
     stream_reader_->RegisterCallback(base::Closure());
 
-    reason =
-        content::ConvertNetErrorToInterruptReason(
-            rename_error,
-            content::DOWNLOAD_INTERRUPT_FROM_DISK);
     new_path.clear();
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(callback, reason, new_path));
 }
 
 void DownloadFileImpl::Detach(base::Closure callback) {
   // Doing the annotation here leaves a small window during
@@ skipping 149 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&content::DownloadDestinationObserver::DestinationUpdate,
                  observer_, BytesSoFar(), CurrentSpeed(), GetHashState()));
 }
 
 // static
 int content::DownloadFile::GetNumberOfDownloadFiles() {
   return number_active_objects_;
 }