Shifted DownloadFile to exporting DownloadInterruptReasons.

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"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_impl.h"
 #include "content/browser/download/download_file_manager.h"
+#include "content/browser/download/download_interrupt_reasons_impl.h"
 #include "content/browser/power_save_blocker.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_id.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
 class ByteStreamReader;
 }
 
@@ skipping 20 matching lines @@
       content::DownloadManager* download_manager,
       bool calculate_hash,
       const net::BoundNetLog& bound_net_log,
       const content::TestFileErrorInjector::FileErrorInfo& error_info,
       const ConstructionCallback& ctor_callback,
       const DestructionCallback& dtor_callback);
 
   ~DownloadFileWithErrors();
 
   // DownloadFile interface.
-  virtual net::Error Initialize() OVERRIDE;
-  virtual net::Error AppendDataToFile(const char* data,
-                                      size_t data_len) OVERRIDE;
-  virtual net::Error Rename(const FilePath& full_path) OVERRIDE;
+  virtual content::DownloadInterruptReason Initialize() OVERRIDE;
+  virtual content::DownloadInterruptReason AppendDataToFile(
+      const char* data, size_t data_len) OVERRIDE;
+  virtual content::DownloadInterruptReason Rename(
+      const FilePath& full_path) OVERRIDE;
 
  private:
   // Error generating helper.
-  net::Error ShouldReturnError(
+  content::DownloadInterruptReason ShouldReturnError(
       content::TestFileErrorInjector::FileOperationCode code,
-      net::Error original_net_error);
+      content::DownloadInterruptReason original_error);
 
   // 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 22 matching lines @@
           source_url_(info->url()),
           error_info_(error_info),
           destruction_callback_(dtor_callback) {
   ctor_callback.Run(source_url_, info->download_id);
 }
 
 DownloadFileWithErrors::~DownloadFileWithErrors() {
   destruction_callback_.Run(source_url_);
 }
 
-net::Error DownloadFileWithErrors::Initialize() {
+content::DownloadInterruptReason DownloadFileWithErrors::Initialize() {
   return ShouldReturnError(
-      content::TestFileErrorInjector::FILE_OPERATION_INITIALIZE,
-      DownloadFileImpl::Initialize());
+          content::TestFileErrorInjector::FILE_OPERATION_INITIALIZE,
+          DownloadFileImpl::Initialize());
 }
 
-net::Error DownloadFileWithErrors::AppendDataToFile(const char* data,
-                                                    size_t data_len) {
+content::DownloadInterruptReason DownloadFileWithErrors::AppendDataToFile(
+    const char* data, size_t data_len) {
   return ShouldReturnError(
       content::TestFileErrorInjector::FILE_OPERATION_WRITE,
       DownloadFileImpl::AppendDataToFile(data, data_len));
 }
 
-net::Error DownloadFileWithErrors::Rename(const FilePath& full_path) {
+content::DownloadInterruptReason DownloadFileWithErrors::Rename(
+    const FilePath& full_path) {
   return ShouldReturnError(
       content::TestFileErrorInjector::FILE_OPERATION_RENAME,
       DownloadFileImpl::Rename(full_path));
 }
 
-net::Error DownloadFileWithErrors::ShouldReturnError(
+content::DownloadInterruptReason DownloadFileWithErrors::ShouldReturnError(
     content::TestFileErrorInjector::FileOperationCode code,
-    net::Error original_net_error) {
+    content::DownloadInterruptReason original_error) {
   int counter = operation_counter_[code];
   ++operation_counter_[code];
 
   if (code != error_info_.code)
-    return original_net_error;
+    return original_error;
 
   if (counter != error_info_.operation_instance)
-    return original_net_error;
+    return original_error;
 
   VLOG(1) << " " << __FUNCTION__ << "()"
           << " url = '" << source_url_.spec() << "'"
           << " code = " << content::TestFileErrorInjector::DebugString(code)
           << " (" << code << ")"
           << " counter = " << counter
-          << " original_error = " << net::ErrorToString(original_net_error)
-          << " (" << original_net_error << ")"
-          << " new error = " << net::ErrorToString(error_info_.net_error)
-          << " (" << error_info_.net_error << ")";
+          << " original_error = "
+          << content::InterruptReasonDebugString(original_error)
+          << " (" << original_error << ")"
+          << " new error = "
+          << content::InterruptReasonDebugString(error_info_.error)
+          << " (" << error_info_.error << ")";
 
-  return error_info_.net_error;
+  return error_info_.error;
 }
 
 }  // namespace
 
 namespace content {
 
 // A factory for constructing DownloadFiles that inject errors.
 class DownloadFileWithErrorsFactory
     : public DownloadFileManager::DownloadFileFactory {
  public:
@@ skipping 42 matching lines @@
     bool calculate_hash,
     const net::BoundNetLog& bound_net_log) {
   std::string url = info->url().spec();
 
   if (injected_errors_.find(url) == injected_errors_.end()) {
     // Have to create entry, because FileErrorInfo is not a POD type.
     TestFileErrorInjector::FileErrorInfo err_info = {
       url,
       TestFileErrorInjector::FILE_OPERATION_INITIALIZE,
       -1,
-      net::OK
+      content::DOWNLOAD_INTERRUPT_REASON_NONE
     };
     injected_errors_[url] = err_info;
   }
 
   return new DownloadFileWithErrors(
       info,
       stream.Pass(),
       new DownloadRequestHandle(info->request_handle),
       download_manager,
       calculate_hash,
@@ skipping 200 matching lines @@
     case FILE_OPERATION_RENAME:
       return "RENAME";
     default:
       break;
   }
 
   return "Unknown";
 }
 
 }  // namespace content