[Downloads] Always call DM::StartDownload() for explicit downloads.

content/public/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 11 matching lines @@
 
 namespace {
 
 // A class that performs file operations and injects errors.
 class DownloadFileWithErrors: public DownloadFileImpl {
  public:
   typedef base::Callback<void(const GURL& url)> ConstructionCallback;
   typedef base::Callback<void(const GURL& url)> DestructionCallback;
 
   DownloadFileWithErrors(
-      scoped_ptr<DownloadSaveInfo> save_info,
+      const DownloadSaveInfo& save_info,
       const base::FilePath& default_download_directory,
       const GURL& url,
       const GURL& referrer_url,
       bool calculate_hash,
-      scoped_ptr<ByteStreamReader> stream,
+      scoped_ptr<net::FileStream> file_stream,
+      scoped_ptr<ByteStreamReader> byte_stream,
       const net::BoundNetLog& bound_net_log,
       scoped_ptr<PowerSaveBlocker> power_save_blocker,
       base::WeakPtr<DownloadDestinationObserver> observer,
       const TestFileErrorInjector::FileErrorInfo& error_info,
       const ConstructionCallback& ctor_callback,
       const DestructionCallback& dtor_callback);
 
   virtual ~DownloadFileWithErrors();
 
   virtual void Initialize(const InitializeCallback& callback) OVERRIDE;
@@ skipping 49 matching lines @@
     DownloadInterruptReason overwrite_error,
     DownloadInterruptReason original_error,
     const base::FilePath& path_result) {
   original_callback.Run(
       overwrite_error,
       overwrite_error == DOWNLOAD_INTERRUPT_REASON_NONE ?
       path_result : base::FilePath());
 }
 
 DownloadFileWithErrors::DownloadFileWithErrors(
-    scoped_ptr<DownloadSaveInfo> save_info,
+    const DownloadSaveInfo& save_info,
     const base::FilePath& default_download_directory,
     const GURL& url,
     const GURL& referrer_url,
     bool calculate_hash,
-    scoped_ptr<ByteStreamReader> stream,
+    scoped_ptr<net::FileStream> file_stream,
+    scoped_ptr<ByteStreamReader> byte_stream,
     const net::BoundNetLog& bound_net_log,
     scoped_ptr<PowerSaveBlocker> power_save_blocker,
     base::WeakPtr<DownloadDestinationObserver> observer,
     const TestFileErrorInjector::FileErrorInfo& error_info,
     const ConstructionCallback& ctor_callback,
     const DestructionCallback& dtor_callback)
-        : DownloadFileImpl(
-            save_info.Pass(), default_download_directory, url, referrer_url,
-            calculate_hash, stream.Pass(), bound_net_log,
-            power_save_blocker.Pass(), observer),
-          source_url_(url),
-          error_info_(error_info),
-          destruction_callback_(dtor_callback) {
+    : DownloadFileImpl(save_info,
+                       default_download_directory,
+                       url,
+                       referrer_url,
+                       calculate_hash,
+                       file_stream.Pass(),
+                       byte_stream.Pass(),
+                       bound_net_log,
+                       power_save_blocker.Pass(),
+                       observer),
+      source_url_(url),
+      error_info_(error_info),
+      destruction_callback_(dtor_callback) {
   // DownloadFiles are created on the UI thread and are destroyed on the FILE
   // thread. Schedule the ConstructionCallback on the FILE thread so that if a
   // DownloadItem schedules a DownloadFile to be destroyed and creates another
   // one (as happens during download resumption), then the DestructionCallback
   // for the old DownloadFile is run before the ConstructionCallback for the
   // next DownloadFile.
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(ctor_callback, source_url_));
@@ skipping 119 matching lines @@
 // A factory for constructing DownloadFiles that inject errors.
 class DownloadFileWithErrorsFactory : public DownloadFileFactory {
  public:
   DownloadFileWithErrorsFactory(
       const DownloadFileWithErrors::ConstructionCallback& ctor_callback,
       const DownloadFileWithErrors::DestructionCallback& dtor_callback);
   virtual ~DownloadFileWithErrorsFactory();
 
   // DownloadFileFactory interface.
   virtual DownloadFile* CreateFile(
-      scoped_ptr<DownloadSaveInfo> save_info,
+      const DownloadSaveInfo& save_info,
       const base::FilePath& default_download_directory,
       const GURL& url,
       const GURL& referrer_url,
       bool calculate_hash,
-      scoped_ptr<ByteStreamReader> stream,
+      scoped_ptr<net::FileStream> file_stream,
+      scoped_ptr<ByteStreamReader> byte_stream,
       const net::BoundNetLog& bound_net_log,
       base::WeakPtr<DownloadDestinationObserver> observer) OVERRIDE;
 
   bool AddError(
       const TestFileErrorInjector::FileErrorInfo& error_info);
 
   void ClearErrors();
 
  private:
   // Our injected error list, mapped by URL.  One per file.
    TestFileErrorInjector::ErrorMap injected_errors_;
 
   // Callback for creation and destruction.
   DownloadFileWithErrors::ConstructionCallback construction_callback_;
   DownloadFileWithErrors::DestructionCallback destruction_callback_;
 };
 
 DownloadFileWithErrorsFactory::DownloadFileWithErrorsFactory(
     const DownloadFileWithErrors::ConstructionCallback& ctor_callback,
     const DownloadFileWithErrors::DestructionCallback& dtor_callback)
         : construction_callback_(ctor_callback),
           destruction_callback_(dtor_callback) {
 }
 
 DownloadFileWithErrorsFactory::~DownloadFileWithErrorsFactory() {
 }
 
 DownloadFile* DownloadFileWithErrorsFactory::CreateFile(
-    scoped_ptr<DownloadSaveInfo> save_info,
+    const DownloadSaveInfo& save_info,
     const base::FilePath& default_download_directory,
     const GURL& url,
     const GURL& referrer_url,
     bool calculate_hash,
-    scoped_ptr<ByteStreamReader> stream,
+    scoped_ptr<net::FileStream> file_stream,
+    scoped_ptr<ByteStreamReader> byte_stream,
     const net::BoundNetLog& bound_net_log,
     base::WeakPtr<DownloadDestinationObserver> observer) {
   if (injected_errors_.find(url.spec()) == injected_errors_.end()) {
     // Have to create entry, because FileErrorInfo is not a POD type.
     TestFileErrorInjector::FileErrorInfo err_info = {
       url.spec(),
       TestFileErrorInjector::FILE_OPERATION_INITIALIZE,
       -1,
       DOWNLOAD_INTERRUPT_REASON_NONE
     };
     injected_errors_[url.spec()] = err_info;
   }
 
   scoped_ptr<PowerSaveBlocker> psb(
       PowerSaveBlocker::Create(
           PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension,
           "Download in progress"));
 
   return new DownloadFileWithErrors(
-      save_info.Pass(),
+      save_info,
       default_download_directory,
       url,
       referrer_url,
       calculate_hash,
-      stream.Pass(),
+      file_stream.Pass(),
+      byte_stream.Pass(),
       bound_net_log,
       psb.Pass(),
       observer,
       injected_errors_[url.spec()],
       construction_callback_,
       destruction_callback_);
 }
 
 bool DownloadFileWithErrorsFactory::AddError(
     const TestFileErrorInjector::FileErrorInfo& error_info) {
@@ skipping 138 matching lines @@
     case FILE_OPERATION_RENAME_ANNOTATE:
       return "RENAME_ANNOTATE";
     default:
       break;
   }
 
   return "Unknown";
 }
 
 }  // namespace content