Skip to content

GitLab

T
tangled
Commit 8a06f8a1 authored by Marijn Kruisselbrink's avatar Marijn Kruisselbrink Committed by Commit Bot
Browse files
Options

Delete deprecated network service blob URL download codepath. 

With network service there should always be a BlobURLToken/blob
URLLoaderFactory, so this fallback code should never be reached.

Tbr: jam@chromium.org
Cq-Include-Trybots: luci.chromium.try:linux_mojo
Bug: 800901
Change-Id: I6e1446f9ed5b5f43c4e5f3be27b098d8401b6a51
Reviewed-on: https://chromium-review.googlesource.com/1112663
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Reviewed-by: default avatarMin Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569834}
parent 5b4db446
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 92 deletions
content/browser/BUILD.gn
View file @ 8a06f8a1
......@@ -728,8 +728,6 @@ jumbo_source_set("browser") {
"dom_storage/session_storage_namespace_impl_mojo.h",
"dom_storage/storage_area_impl.cc",
"dom_storage/storage_area_impl.h",
"download/blob_download_url_loader_factory_getter.cc",
"download/blob_download_url_loader_factory_getter.h",
"download/byte_stream_input_stream.cc",
"download/byte_stream_input_stream.h",
"download/download_item_utils.cc",
......
content/browser/download/blob_download_url_loader_factory_getter.cc deleted 100644 → 0
View file @ 5b4db446
// Copyright 2018 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/blob_download_url_loader_factory_getter.h"
#include "components/download/public/common/download_task_runner.h"
#include "content/browser/url_loader_factory_getter.h"
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "storage/browser/blob/blob_data_handle.h"
#include "storage/browser/blob/blob_url_loader_factory.h"
namespace content {
BlobDownloadURLLoaderFactoryGetter::BlobDownloadURLLoaderFactoryGetter(
const GURL& url,
std::unique_ptr<storage::BlobDataHandle> blob_data_handle)
: url_(url), blob_data_handle_(std::move(blob_data_handle)) {
DCHECK(url.SchemeIs(url::kBlobScheme));
}
BlobDownloadURLLoaderFactoryGetter::~BlobDownloadURLLoaderFactoryGetter() =
default;
scoped_refptr<network::SharedURLLoaderFactory>
BlobDownloadURLLoaderFactoryGetter::GetURLLoaderFactory() {
DCHECK(download::GetIOTaskRunner());
DCHECK(download::GetIOTaskRunner()->BelongsToCurrentThread());
network::mojom::URLLoaderFactoryPtrInfo url_loader_factory_ptr_info;
storage::BlobURLLoaderFactory::Create(
std::move(blob_data_handle_), url_,
mojo::MakeRequest(&url_loader_factory_ptr_info));
return base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(url_loader_factory_ptr_info));
}
} // namespace content
content/browser/download/blob_download_url_loader_factory_getter.h deleted 100644 → 0
View file @ 5b4db446
// Copyright 2018 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.
#ifndef CONTENT_BROWSER_DOWNLOAD_BLOB_DOWNLOAD_URL_LOADER_FACTORY_GETTER_H_
#define CONTENT_BROWSER_DOWNLOAD_BLOB_DOWNLOAD_URL_LOADER_FACTORY_GETTER_H_
#include "components/download/public/common/download_url_loader_factory_getter.h"
#include "url/gurl.h"
namespace storage {
class BlobDataHandle;
}
namespace content {
// Class for retrieving the URLLoaderFactory for a blob URL.
class BlobDownloadURLLoaderFactoryGetter
: public download::DownloadURLLoaderFactoryGetter {
public:
BlobDownloadURLLoaderFactoryGetter(
const GURL& url,
std::unique_ptr<storage::BlobDataHandle> blob_data_handle);
// download::DownloadURLLoaderFactoryGetter implementation.
scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
protected:
~BlobDownloadURLLoaderFactoryGetter() override;
private:
GURL url_;
std::unique_ptr<storage::BlobDataHandle> blob_data_handle_;
DISALLOW_COPY_AND_ASSIGN(BlobDownloadURLLoaderFactoryGetter);
};
} // namespace content
#endif // CONTENT_BROWSER_DOWNLOAD_BLOB_DOWNLOAD_URL_LOADER_FACTORY_GETTER_H_
content/browser/download/download_manager_impl.cc
View file @ 8a06f8a1
......@@ -39,7 +39,6 @@
#include "content/browser/byte_stream.h"
#include "content/browser/child_process_security_policy_impl.h"
#include "content/browser/devtools/render_frame_devtools_agent_host.h"
#include "content/browser/download/blob_download_url_loader_factory_getter.h"
#include "content/browser/download/byte_stream_input_stream.h"
#include "content/browser/download/download_resource_handler.h"
#include "content/browser/download/download_url_loader_factory_getter_impl.h"
......@@ -1074,7 +1073,6 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete(
void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
std::unique_ptr<download::DownloadUrlParameters> params,
std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
bool is_new_download,
const GURL& site_url,
......@@ -1096,6 +1094,7 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
}
}
DCHECK_EQ(params->url().SchemeIsBlob(), bool{blob_url_loader_factory});
scoped_refptr<download::DownloadURLLoaderFactoryGetter>
url_loader_factory_getter;
if (blob_url_loader_factory) {
......@@ -1103,10 +1102,6 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete(
url_loader_factory_getter =
base::MakeRefCounted<DownloadURLLoaderFactoryGetterImpl>(
blob_url_loader_factory->Clone());
} else if (params->url().SchemeIsBlob()) {
url_loader_factory_getter =
base::MakeRefCounted<BlobDownloadURLLoaderFactoryGetter>(
params->url(), std::move(blob_data_handle));
} else if (params->url().SchemeIsFile()) {
url_loader_factory_getter =
base::MakeRefCounted<FileDownloadURLLoaderFactoryGetter>(
......@@ -1158,8 +1153,7 @@ void DownloadManagerImpl::BeginDownloadInternal(
on_can_download_checks_done = base::BindOnce(
&DownloadManagerImpl::BeginResourceDownloadOnChecksComplete,
weak_factory_.GetWeakPtr(), std::move(params),
std::move(blob_data_handle), std::move(blob_url_loader_factory),
is_new_download, site_url);
std::move(blob_url_loader_factory), is_new_download, site_url);
if (delegate_) {
delegate_->CheckDownloadAllowed(std::move(web_contents_getter), url,
method,
......@@ -1169,9 +1163,8 @@ void DownloadManagerImpl::BeginDownloadInternal(
}
BeginResourceDownloadOnChecksComplete(
std::move(params), std::move(blob_data_handle),
std::move(blob_url_loader_factory), is_new_download, site_url,
rfh ? !content_initiated : true);
std::move(params), std::move(blob_url_loader_factory), is_new_download,
site_url, rfh ? !content_initiated : true);
} else {
StoragePartition* storage_partition =
BrowserContext::GetStoragePartitionForSite(browser_context_, site_url);
......
content/browser/download/download_manager_impl.h
View file @ 8a06f8a1
......@@ -274,7 +274,6 @@ class CONTENT_EXPORT DownloadManagerImpl
bool is_download_allowed);
void BeginResourceDownloadOnChecksComplete(
std::unique_ptr<download::DownloadUrlParameters> params,
std::unique_ptr<storage::BlobDataHandle> blob_data_handle,
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory,
bool is_new_download,
const GURL& site_url,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment