Move self-deleting URLLoaderFactory base into //services/network.

This CL moves the self-deleting content::NonNetworkURLLoaderFactoryBased
from //content/public/browser into
network::SelfDeletingURLLoaderFactoryBase in
//services/network/public/cpp.

This move is primarily motivated by the desire to also use the moved
base class when implementing network::NotImplementedURLLoaderFactory.

Bug: 1168249
Change-Id: I1563f4ebfc39b53061806356188e64080e5f923b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2644847
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Auto-Submit: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#847810}

chrome/browser/chrome_content_browser_client.cc

@@ -308,7 +308,6 @@
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/navigation_throttle.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "content/public/browser/overlay_window.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -366,6 +365,7 @@
 #include "services/network/public/cpp/is_potentially_trustworthy.h"
 #include "services/network/public/cpp/network_switches.h"
 #include "services/network/public/cpp/resource_request.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 #include "services/strings/grit/services_strings.h"
 #include "storage/browser/file_system/external_mount_points.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
@@ -4694,7 +4694,7 @@ namespace {
 // pages.  Checks with the ChildProcessSecurityPolicy to validate the file
 // access.
 class SpecialAccessFileURLLoaderFactory
-    : public content::NonNetworkURLLoaderFactoryBase {
+    : public network::SelfDeletingURLLoaderFactory {
  public:
   // Returns mojo::PendingRemote to a newly constructed
   // SpecialAccessFileURLLoaderFactory.  The factory is self-owned - it will
@@ -4706,8 +4706,8 @@ class SpecialAccessFileURLLoaderFactory
     mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
 
     // The SpecialAccessFileURLLoaderFactory will delete itself when there are
-    // no more receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect
-    // method.
+    // no more receivers - see the
+    // network::SelfDeletingURLLoaderFactory::OnDisconnect method.
     new SpecialAccessFileURLLoaderFactory(
         child_id, pending_remote.InitWithNewPipeAndPassReceiver());
 
@@ -4718,7 +4718,7 @@ class SpecialAccessFileURLLoaderFactory
   explicit SpecialAccessFileURLLoaderFactory(
       int child_id,
       mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-      : content::NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
+      : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
         child_id_(child_id) {}
 
   // network::mojom::URLLoaderFactory:

chrome/browser/chromeos/fileapi/external_file_url_loader_factory.cc

@@ -343,7 +343,7 @@ ExternalFileURLLoaderFactory::ExternalFileURLLoaderFactory(
     void* profile_id,
     int render_process_host_id,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-    : content::NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
+    : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
       profile_id_(profile_id),
       render_process_host_id_(render_process_host_id) {}
 
@@ -378,7 +378,8 @@ ExternalFileURLLoaderFactory::Create(void* profile_id,
   mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
 
   // The ExternalFileURLLoaderFactory will delete itself when there are no more
-  // receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
+  // receivers - see the network::SelfDeletingURLLoaderFactory::OnDisconnect
+  // method.
   new ExternalFileURLLoaderFactory(
       profile_id, render_process_host_id,
       pending_remote.InitWithNewPipeAndPassReceiver());

chrome/browser/chromeos/fileapi/external_file_url_loader_factory.h

@@ -6,18 +6,18 @@
 #define CHROME_BROWSER_CHROMEOS_FILEAPI_EXTERNAL_FILE_URL_LOADER_FACTORY_H_
 
 #include "base/macros.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 
 namespace chromeos {
 
 // URLLoaderFactory that creates URLLoader instances for URLs with the
 // externalfile scheme.
 class ExternalFileURLLoaderFactory
-    : public content::NonNetworkURLLoaderFactoryBase {
+    : public network::SelfDeletingURLLoaderFactory {
  public:
   // Returns mojo::PendingRemote to a newly constructed
   // ExternalFileURLLoaderFactory.  The factory is self-owned - it will delete

chromecast/browser/cast_extension_url_loader_factory.cc

@@ -176,7 +176,7 @@ CastExtensionURLLoaderFactory::CastExtensionURLLoaderFactory(
     content::BrowserContext* browser_context,
     mojo::PendingRemote<network::mojom::URLLoaderFactory> extension_factory,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-    : content::NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
+    : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
       extension_registry_(extensions::ExtensionRegistry::Get(browser_context)),
       extension_factory_(std::move(extension_factory)),
       network_factory_(
@@ -284,7 +284,8 @@ CastExtensionURLLoaderFactory::Create(
     return pending_remote;
 
   // The CastExtensionURLLoaderFactory will delete itself when there are no more
-  // receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
+  // receivers - see the network::SelfDeletingURLLoaderFactory::OnDisconnect
+  // method.
   new CastExtensionURLLoaderFactory(
       browser_context, std::move(extension_factory),
       pending_remote.InitWithNewPipeAndPassReceiver());

chromecast/browser/cast_extension_url_loader_factory.h

@@ -11,11 +11,11 @@
 #include "base/no_destructor.h"
 #include "components/keyed_service/content/browser_context_keyed_service_shutdown_notifier_factory.h"
 #include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "mojo/public/cpp/bindings/remote.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 
@@ -35,7 +35,7 @@ namespace shell {
 // URLLoader implementation because Cast sometimes loads extension resources
 // from the web.
 class CastExtensionURLLoaderFactory
-    : public content::NonNetworkURLLoaderFactoryBase {
+    : public network::SelfDeletingURLLoaderFactory {
  public:
   // Returns mojo::PendingRemote to a newly constructed
   // CastExtensionURLLoaderFactory.  The factory is self-owned - it will delete

content/browser/about_url_loader_factory.cc

@@ -12,7 +12,7 @@ namespace content {
 
 AboutURLLoaderFactory::AboutURLLoaderFactory(
     mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-    : NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)) {}
+    : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)) {}
 
 AboutURLLoaderFactory::~AboutURLLoaderFactory() = default;
 
@@ -50,7 +50,8 @@ AboutURLLoaderFactory::Create() {
   mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
 
   // The AboutURLLoaderFactory will delete itself when there are no more
-  // receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
+  // receivers - see the network::SelfDeletingURLLoaderFactory::OnDisconnect
+  // method.
   new AboutURLLoaderFactory(pending_remote.InitWithNewPipeAndPassReceiver());
 
   return pending_remote;

content/browser/about_url_loader_factory.h

@@ -6,16 +6,16 @@
 #define CONTENT_BROWSER_ABOUT_URL_LOADER_FACTORY_H_
 
 #include "base/macros.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 
 namespace content {
 
 // URLLoaderFactory for handling about: URLs. This treats everything as
 // about:blank since no other about: features should be available to web
 // content.
-class AboutURLLoaderFactory : public NonNetworkURLLoaderFactoryBase {
+class AboutURLLoaderFactory : public network::SelfDeletingURLLoaderFactory {
  public:
   // Returns mojo::PendingRemote to a newly constructed AboutURLLoadedFactory.
   // The factory is self-owned - it will delete itself once there are no more

content/browser/android/content_url_loader_factory.cc

@@ -299,7 +299,7 @@ class ContentURLLoader : public network::mojom::URLLoader {
 ContentURLLoaderFactory::ContentURLLoaderFactory(
     scoped_refptr<base::SequencedTaskRunner> task_runner,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-    : NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
+    : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
       task_runner_(std::move(task_runner)) {}
 
 ContentURLLoaderFactory::~ContentURLLoaderFactory() = default;
@@ -323,7 +323,8 @@ ContentURLLoaderFactory::Create() {
   mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
 
   // The ContentURLLoaderFactory will delete itself when there are no more
-  // receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
+  // receivers - see the network::SelfDeletingURLLoaderFactory::OnDisconnect
+  // method.
   new ContentURLLoaderFactory(
       base::ThreadPool::CreateSequencedTaskRunner(
           {base::MayBlock(), base::TaskPriority::BEST_EFFORT,

content/browser/android/content_url_loader_factory.h

@@ -9,16 +9,16 @@
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 
 namespace content {
 
 // A URLLoaderFactory used for the content:// scheme used when Network Service
 // is enabled.
 class CONTENT_EXPORT ContentURLLoaderFactory
-    : public NonNetworkURLLoaderFactoryBase {
+    : public network::SelfDeletingURLLoaderFactory {
  public:
   // Returns mojo::PendingRemote to a newly constructed ContentURLLoadedFactory.
   // The factory is self-owned - it will delete itself once there are no more

content/browser/data_url_loader_factory.cc

@@ -42,7 +42,8 @@ void OnWrite(std::unique_ptr<WriteData> write_data, MojoResult result) {
 DataURLLoaderFactory::DataURLLoaderFactory(
     const GURL& url,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-    : NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)), url_(url) {}
+    : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
+      url_(url) {}
 
 DataURLLoaderFactory::~DataURLLoaderFactory() = default;
 
@@ -119,7 +120,8 @@ DataURLLoaderFactory::CreateForOneSpecificUrl(const GURL& url) {
   mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
 
   // The DataURLLoaderFactory will delete itself when there are no more
-  // receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
+  // receivers - see the network::SelfDeletingURLLoaderFactory::OnDisconnect
+  // method.
   new DataURLLoaderFactory(url,
                            pending_remote.InitWithNewPipeAndPassReceiver());
 

content/browser/data_url_loader_factory.h

@@ -6,14 +6,14 @@
 #define CONTENT_BROWSER_DATA_URL_LOADER_FACTORY_H_
 
 #include "base/macros.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 
 namespace content {
 
 // URLLoaderFactory for handling data: URLs.
-class DataURLLoaderFactory : public NonNetworkURLLoaderFactoryBase {
+class DataURLLoaderFactory : public network::SelfDeletingURLLoaderFactory {
  public:
   // Returns mojo::PendingRemote to a newly constructed DataURLLoadedFactory.
   // The factory is self-owned - it will delete itself once there are no more

content/browser/file_system/file_system_url_loader_factory.cc

@@ -24,7 +24,6 @@
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/child_process_host.h"
@@ -40,6 +39,7 @@
 #include "net/base/mime_util.h"
 #include "net/http/http_byte_range.h"
 #include "net/http/http_util.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 #include "services/network/public/mojom/url_loader.mojom.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"
 #include "storage/browser/file_system/file_stream_reader.h"
@@ -600,13 +600,14 @@ class FileSystemFileURLLoader : public FileSystemEntryURLLoader {
 
 // A URLLoaderFactory used for the filesystem:// scheme used when the Network
 // Service is enabled.
-class FileSystemURLLoaderFactory : public NonNetworkURLLoaderFactoryBase {
+class FileSystemURLLoaderFactory
+    : public network::SelfDeletingURLLoaderFactory {
  public:
   FileSystemURLLoaderFactory(
       FactoryParams params,
       scoped_refptr<base::SequencedTaskRunner> io_task_runner,
       mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-      : NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
+      : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
         params_(std::move(params)),
         io_task_runner_(io_task_runner) {}
 
@@ -660,7 +661,8 @@ CreateFileSystemURLLoaderFactory(
                           file_system_context, storage_domain};
 
   // The FileSystemURLLoaderFactory will delete itself when there are no more
-  // receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
+  // receivers - see the network::SelfDeletingURLLoaderFactory::OnDisconnect
+  // method.
   new FileSystemURLLoaderFactory(
       std::move(params), GetIOThreadTaskRunner({}),
       pending_remote.InitWithNewPipeAndPassReceiver());

content/browser/loader/file_url_loader_factory.cc

@@ -774,7 +774,7 @@ FileURLLoaderFactory::FileURLLoaderFactory(
     scoped_refptr<SharedCorsOriginAccessList> shared_cors_origin_access_list,
     base::TaskPriority task_priority,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-    : NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
+    : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
       profile_path_(profile_path),
       shared_cors_origin_access_list_(
           std::move(shared_cors_origin_access_list)),
@@ -825,6 +825,9 @@ void FileURLLoaderFactory::CreateLoaderAndStart(
                  .CheckAccessState(*request.request_initiator, request.url) ==
              network::cors::OriginAccessList::AccessState::kAllowed)));
 
+  // TODO(toyoshim, lukasza): https://crbug.com/1105256: Extract CORS checks
+  // into a separate base class (i.e. to reuse similar checks in
+  // FileURLLoaderFactory and ExtensionURLLoaderFactory.
   network::mojom::FetchResponseType response_type =
       network::cors::CalculateResponseType(request.mode,
                                            is_request_considered_same_origin);
@@ -887,7 +890,8 @@ FileURLLoaderFactory::Create(
   mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
 
   // The FileURLLoaderFactory will delete itself when there are no more
-  // receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
+  // receivers - see the network::SelfDeletingURLLoaderFactory::OnDisconnect
+  // method.
   new FileURLLoaderFactory(
       profile_path, std::move(shared_cors_origin_access_list), task_priority,
       pending_remote.InitWithNewPipeAndPassReceiver());

content/browser/loader/file_url_loader_factory.h

@@ -11,9 +11,9 @@
 #include "base/sequenced_task_runner.h"
 #include "base/task/task_traits.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 
 namespace content {
 
@@ -24,7 +24,7 @@ class SharedCorsOriginAccessList;
 // If a caller needs a request that has a fetch request mode other than
 // "no-cors", this class should be used on the UI thread.
 class CONTENT_EXPORT FileURLLoaderFactory
-    : public NonNetworkURLLoaderFactoryBase {
+    : public network::SelfDeletingURLLoaderFactory {
  public:
   // Returns mojo::PendingRemote to a newly constructed FileURLLoaderFactory.
   // The factory is self-owned - it will delete itself once there are no more

content/browser/webui/web_ui_url_loader_factory.cc

@@ -23,7 +23,6 @@
 #include "content/browser/webui/url_data_source_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/non_network_url_loader_factory_base.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "mojo/public/cpp/bindings/message.h"
@@ -32,6 +31,7 @@
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/network/public/cpp/parsed_headers.h"
+#include "services/network/public/cpp/self_deleting_url_loader_factory.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 #include "ui/base/template_expressions.h"
 
@@ -204,7 +204,7 @@ void StartURLLoader(
                                      std::move(data_available_callback));
 }
 
-class WebUIURLLoaderFactory : public NonNetworkURLLoaderFactoryBase {
+class WebUIURLLoaderFactory : public network::SelfDeletingURLLoaderFactory {
  public:
   // Returns mojo::PendingRemote to a newly constructed WebUIURLLoaderFactory.
   // The factory is self-owned - it will delete itself once there are no more
@@ -220,7 +220,8 @@ class WebUIURLLoaderFactory : public NonNetworkURLLoaderFactoryBase {
     mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
 
     // The WebUIURLLoaderFactory will delete itself when there are no more
-    // receivers - see the NonNetworkURLLoaderFactoryBase::OnDisconnect method.
+    // receivers - see the
+    // network::SelfDeletingURLLoaderFactory::OnDisconnect method.
     new WebUIURLLoaderFactory(ftn, scheme, std::move(allowed_hosts),
                               pending_remote.InitWithNewPipeAndPassReceiver());
 
@@ -307,7 +308,7 @@ class WebUIURLLoaderFactory : public NonNetworkURLLoaderFactoryBase {
       const std::string& scheme,
       base::flat_set<std::string> allowed_hosts,
       mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_receiver)
-      : NonNetworkURLLoaderFactoryBase(std::move(factory_receiver)),
+      : network::SelfDeletingURLLoaderFactory(std::move(factory_receiver)),
         frame_tree_node_id_(ftn->frame_tree_node_id()),
         scheme_(scheme),
         allowed_hosts_(std::move(allowed_hosts)) {}

content/public/browser/BUILD.gn

@@ -237,8 +237,6 @@ source_set("browser_sources") {
     "network_context_client_base.h",
     "network_quality_observer_factory.h",
     "network_service_instance.h",
-    "non_network_url_loader_factory_base.cc",
-    "non_network_url_loader_factory_base.h",
     "notification_database_data.cc",
     "notification_database_data.h",
     "notification_details.h",

content/public/browser/file_url_loader.h

@@ -51,6 +51,13 @@ class CONTENT_EXPORT FileURLLoaderObserver
 // The URLLoader created by this function does *not* automatically follow
 // filesytem links (e.g. Windows shortcuts) or support directory listing.
 // A directory path will always yield a FILE_NOT_FOUND network error.
+//
+// TODO(lukasza): Responding with file contents is (a little bit, not quite)
+// duplicated across FileURLLoaderFactory, ContentURLLoaderFactory and
+// ExtensionURLLoaderFactory.  Consider moving file-handling functionality
+// into a shared base class of network::mojom::URLLoaderFactory (similarly to
+// how SelfDeletingURLLoaderFactory provides lifetime management for its derived
+// classes).
 CONTENT_EXPORT void CreateFileURLLoaderBypassingSecurityChecks(
     const network::ResourceRequest& request,
     mojo::PendingReceiver<network::mojom::URLLoader> loader,