Shifted DownloadFile to exporting DownloadInterruptReasons.

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 40 matching lines @@
           bound_net_log_(bound_net_log),
           weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
           power_save_blocker_(power_save_blocker.Pass()) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(download_manager.get());
 }
 
 DownloadFileImpl::~DownloadFileImpl() {
 }
 
-// BaseFile delegated functions.
-net::Error DownloadFileImpl::Initialize() {
+content::DownloadInterruptReason DownloadFileImpl::Initialize() {
   update_timer_.reset(new base::RepeatingTimer<DownloadFileImpl>());
   net::Error result = file_.Initialize();
-  if (result != net::OK)
-    return result;
+  if (result != net::OK) {
+    return content::ConvertNetErrorToInterruptReason(
+        result, content::DOWNLOAD_INTERRUPT_FROM_DISK);
+  }
 
   stream_reader_->RegisterCallback(
       base::Bind(&DownloadFileImpl::StreamActive, weak_factory_.GetWeakPtr()));
 
   download_start_ = base::TimeTicks::Now();
   // Initial pull from the straw.
   StreamActive();
 
-  return result;
+  return content::DOWNLOAD_INTERRUPT_REASON_NONE;
 }
 
-net::Error DownloadFileImpl::AppendDataToFile(const char* data,
-                                              size_t data_len) {
+content::DownloadInterruptReason DownloadFileImpl::AppendDataToFile(
+    const char* data, size_t data_len) {
   if (!update_timer_->IsRunning()) {
     update_timer_->Start(FROM_HERE,
                          base::TimeDelta::FromMilliseconds(kUpdatePeriodMs),
                          this, &DownloadFileImpl::SendUpdate);
   }
-  return file_.AppendDataToFile(data, data_len);
+  return content::ConvertNetErrorToInterruptReason(
+      file_.AppendDataToFile(data, data_len),
+      content::DOWNLOAD_INTERRUPT_FROM_DISK);
 }
 
-net::Error DownloadFileImpl::Rename(const FilePath& full_path) {
-  return file_.Rename(full_path);
+content::DownloadInterruptReason DownloadFileImpl::Rename(
+    const FilePath& full_path) {
+  return content::ConvertNetErrorToInterruptReason(
+      file_.Rename(full_path),
+      content::DOWNLOAD_INTERRUPT_FROM_DISK);
 }
 
 void DownloadFileImpl::Detach() {
   file_.Detach();
 }
 
 void DownloadFileImpl::Cancel() {
   file_.Cancel();
 }
 
@@ skipping 68 matching lines @@
       content::ByteStreamReader::STREAM_EMPTY);
   content::DownloadInterruptReason reason =
       content::DOWNLOAD_INTERRUPT_REASON_NONE;
   base::TimeDelta delta(
       base::TimeDelta::FromMilliseconds(kMaxTimeBlockingFileThreadMs));
 
   // Take care of any file local activity required.
   do {
     state = stream_reader_->Read(&incoming_data, &incoming_data_size);
 
-    net::Error result = net::OK;
     switch (state) {
       case content::ByteStreamReader::STREAM_EMPTY:
         break;
       case content::ByteStreamReader::STREAM_HAS_DATA:
         {
           ++num_buffers;
           base::TimeTicks write_start(base::TimeTicks::Now());
-          result = AppendDataToFile(
+          reason = AppendDataToFile(
               incoming_data.get()->data(), incoming_data_size);
           disk_writes_time_ += (base::TimeTicks::Now() - write_start);
           bytes_seen_ += incoming_data_size;
           total_incoming_data_size += incoming_data_size;
-          reason = content::ConvertNetErrorToInterruptReason(
-              result, content::DOWNLOAD_INTERRUPT_FROM_DISK);
         }
         break;
       case content::ByteStreamReader::STREAM_COMPLETE:
         {
           reason = stream_reader_->GetStatus();
           SendUpdate();
           base::TimeTicks close_start(base::TimeTicks::Now());
           file_.Finish();
           base::TimeTicks now(base::TimeTicks::Now());
           disk_writes_time_ += (now - close_start);
@@ skipping 58 matching lines @@
   }
 }
 
 void DownloadFileImpl::SendUpdate() {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&DownloadManager::UpdateDownload,
                  download_manager_, id_.local(),
                  BytesSoFar(), CurrentSpeed(), GetHashState()));
 }