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

content/browser/download/download_file_unittest.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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/files/file.h"
 #include "base/files/file_util.h"
@@ skipping 57 matching lines @@
 MATCHER(IsNullCallback, "") { return (arg.is_null()); }
 
 typedef void (DownloadFile::*DownloadFileRenameMethodType)(
     const base::FilePath&,
     const DownloadFile::RenameCompletionCallback&);
 
 // This is a test DownloadFileImpl that has no retry delay and, on Posix,
 // retries renames failed due to ACCESS_DENIED.
 class TestDownloadFileImpl : public DownloadFileImpl {
  public:
-  TestDownloadFileImpl(scoped_ptr<DownloadSaveInfo> save_info,
+  TestDownloadFileImpl(const DownloadSaveInfo& save_info,
                        const base::FilePath& default_downloads_directory,
                        const GURL& url,
                        const GURL& referrer_url,
                        bool calculate_hash,
+                       base::File file,
                        scoped_ptr<ByteStreamReader> stream,
                        const net::BoundNetLog& bound_net_log,
                        base::WeakPtr<DownloadDestinationObserver> observer)
-      : DownloadFileImpl(std::move(save_info),
+      : DownloadFileImpl(save_info,
                          default_downloads_directory,
                          url,
                          referrer_url,
                          calculate_hash,
+                         std::move(file),
                          std::move(stream),
                          bound_net_log,
                          observer) {}
 
  protected:
   base::TimeDelta GetRetryDelayForFailedRename(int attempt_count) override {
     return base::TimeDelta::FromMilliseconds(0);
   }
 
 #if !defined(OS_WIN)
@@ skipping 68 matching lines @@
 
     input_stream_ = new StrictMock<MockByteStreamReader>();
 
     // TODO: Need to actually create a function that'll set the variables
     // based on the inputs from the callback.
     EXPECT_CALL(*input_stream_, RegisterCallback(_))
         .WillOnce(Invoke(this, &DownloadFileTest::RegisterCallback))
         .RetiresOnSaturation();
 
     scoped_ptr<DownloadSaveInfo> save_info(new DownloadSaveInfo());
-    scoped_ptr<TestDownloadFileImpl> download_file_impl(
-        new TestDownloadFileImpl(
-            std::move(save_info), base::FilePath(),
-            GURL(),  // Source
-            GURL(),  // Referrer
-            calculate_hash, scoped_ptr<ByteStreamReader>(input_stream_),
-            net::BoundNetLog(), observer_factory_.GetWeakPtr()));
-    download_file_impl->SetClientGuid("12345678-ABCD-1234-DCBA-123456789ABC");
-    download_file_ = std::move(download_file_impl);
+    download_file_.reset(new TestDownloadFileImpl(
+        *save_info, base::FilePath(),
+        GURL(),  // Source
+        GURL(),  // Referrer
+        calculate_hash, std::move(save_info->file),
+        scoped_ptr<ByteStreamReader>(input_stream_), net::BoundNetLog(),
+        observer_factory_.GetWeakPtr()));
+    download_file_->SetClientGuid("12345678-ABCD-1234-DCBA-123456789ABC");
 
     EXPECT_CALL(*input_stream_, Read(_, _))
         .WillOnce(Return(ByteStreamReader::STREAM_EMPTY))
         .RetiresOnSaturation();
 
     base::WeakPtrFactory<DownloadFileTest> weak_ptr_factory(this);
     DownloadInterruptReason result = DOWNLOAD_INTERRUPT_REASON_NONE;
     base::RunLoop loop_runner;
     download_file_->Initialize(base::Bind(
         &DownloadFileTest::SetInterruptReasonCallback,
@@ skipping 589 matching lines @@
 
   EXPECT_EQ(static_cast<int64_t>(strlen(kTestData1) + strlen(kTestData2)),
             bytes_);
   EXPECT_EQ(download_file_->GetHashState(), hash_state_);
 
   FinishStream(DOWNLOAD_INTERRUPT_REASON_NONE, true);
   DestroyDownloadFile(0);
 }
 
 }  // namespace content