summaryrefslogtreecommitdiff
path: root/chromium/components/download/internal/common/download_worker.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/components/download/internal/common/download_worker.cc')
-rw-r--r--chromium/components/download/internal/common/download_worker.cc20
1 files changed, 12 insertions, 8 deletions
diff --git a/chromium/components/download/internal/common/download_worker.cc b/chromium/components/download/internal/common/download_worker.cc
index c05b1f8a0c2..b6f3aa58879 100644
--- a/chromium/components/download/internal/common/download_worker.cc
+++ b/chromium/components/download/internal/common/download_worker.cc
@@ -4,13 +4,13 @@
#include "components/download/internal/common/download_worker.h"
-#include "base/message_loop/message_loop.h"
+#include "components/download/internal/common/resource_downloader.h"
#include "components/download/public/common/download_create_info.h"
#include "components/download/public/common/download_interrupt_reasons.h"
#include "components/download/public/common/download_task_runner.h"
+#include "components/download/public/common/download_url_loader_factory_getter.h"
#include "components/download/public/common/download_utils.h"
#include "components/download/public/common/input_stream.h"
-#include "components/download/public/common/resource_downloader.h"
#include "components/download/public/common/url_download_handler_factory.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
@@ -43,10 +43,11 @@ class CompletedInputStream : public InputStream {
void CreateUrlDownloadHandler(
std::unique_ptr<DownloadUrlParameters> params,
base::WeakPtr<UrlDownloadHandler::Delegate> delegate,
- scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory,
+ scoped_refptr<download::DownloadURLLoaderFactoryGetter>
+ url_loader_factory_getter,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
auto downloader = UrlDownloadHandlerFactory::Create(
- std::move(params), delegate, std::move(shared_url_loader_factory),
+ std::move(params), delegate, std::move(url_loader_factory_getter),
task_runner);
task_runner->PostTask(
FROM_HERE,
@@ -74,11 +75,12 @@ DownloadWorker::~DownloadWorker() = default;
void DownloadWorker::SendRequest(
std::unique_ptr<DownloadUrlParameters> params,
- scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory) {
+ scoped_refptr<download::DownloadURLLoaderFactoryGetter>
+ url_loader_factory_getter) {
GetIOTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&CreateUrlDownloadHandler, std::move(params),
weak_factory_.GetWeakPtr(),
- std::move(shared_url_loader_factory),
+ std::move(url_loader_factory_getter),
base::ThreadTaskRunnerHandle::Get()));
}
@@ -104,7 +106,8 @@ void DownloadWorker::Cancel(bool user_cancel) {
void DownloadWorker::OnUrlDownloadStarted(
std::unique_ptr<DownloadCreateInfo> create_info,
std::unique_ptr<InputStream> input_stream,
- scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory,
+ scoped_refptr<download::DownloadURLLoaderFactoryGetter>
+ url_loader_factory_getter,
const DownloadUrlParameters::OnStartedCallback& callback) {
// |callback| is not used in subsequent requests.
DCHECK(callback.is_null());
@@ -134,7 +137,8 @@ void DownloadWorker::OnUrlDownloadStarted(
Pause();
}
- delegate_->OnInputStreamReady(this, std::move(input_stream));
+ delegate_->OnInputStreamReady(this, std::move(input_stream),
+ std::move(create_info));
}
void DownloadWorker::OnUrlDownloadStopped(UrlDownloadHandler* downloader) {