[Blob URLs] Remove content::BlobURLLoaderFactory and related code.
This class was the initial attempt at adding blob URL support to the
network service, but later a different approach was taken for blob
URLs where a explicit URLLoaderFactory needs to be passed in for
every blob URL fetch.
Getting rid of the old code revealed some places where the new code
doesn't pass in a blob URL Loader Factory, so fallback code is added
to those places (in NavigationControllerImpl for browser initiated
navigations and in RenderFrameHostImpl for renderer initiated
navigations) to make sure things keep working in all cases.
Bug: 800901
Cq-Include-Trybots: luci.chromium.try:linux_mojo
Change-Id: Icebab3007bef73910b20f6994c963c36f090605e
Reviewed-on: https://chromium-review.googlesource.com/1100100
Commit-Queue: Marijn Kruisselbrink <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Cr-Commit-Position: refs/heads/master@{#569819}diff --git a/content/browser/url_loader_factory_getter.h b/content/browser/url_loader_factory_getter.h
index da31f8c..39bfbab5 100644
--- a/content/browser/url_loader_factory_getter.h
+++ b/content/browser/url_loader_factory_getter.h
@@ -66,11 +66,6 @@
CONTENT_EXPORT void CloneNetworkFactory(
network::mojom::URLLoaderFactoryRequest network_factory_request);
- // Called on the IO thread to get the URLLoaderFactory to the blob service.
- // Must be used only if the network service or servicified service worker is
- // enabled. The pointer shouldn't be cached.
- CONTENT_EXPORT network::mojom::URLLoaderFactory* GetBlobFactory();
-
// Overrides the network URLLoaderFactory for subsequent requests. Passing a
// null pointer will restore the default behavior.
CONTENT_EXPORT void SetNetworkFactoryForTesting(
@@ -102,8 +97,7 @@
CONTENT_EXPORT ~URLLoaderFactoryGetter();
void InitializeOnIOThread(
- network::mojom::URLLoaderFactoryPtrInfo network_factory,
- network::mojom::URLLoaderFactoryPtrInfo blob_factory);
+ network::mojom::URLLoaderFactoryPtrInfo network_factory);
// Send |network_factory_request| to cached |StoragePartitionImpl|.
void HandleNetworkFactoryRequestOnUIThread(
@@ -118,11 +112,9 @@
// Bound with appropriate URLLoaderFactories at HandleFactoryRequests().
network::mojom::URLLoaderFactoryRequest pending_network_factory_request_;
- network::mojom::URLLoaderFactoryRequest pending_blob_factory_request_;
// Only accessed on IO thread.
network::mojom::URLLoaderFactoryPtr network_factory_;
- network::mojom::URLLoaderFactoryPtr blob_factory_;
network::mojom::URLLoaderFactory* test_factory_ = nullptr;
// Used to re-create |network_factory_| when connection error happens. Can
