chore: cache URLLoaderFactory per-session (#19998) (#20021)

* cache the URLLoaderFactory in AtomBrowserContext

* use cached loader factory in AtomURLLoaderFactory

shell/browser/api/atom_api_url_request_ns.cc

@@ -6,13 +6,10 @@
 
 #include <utility>
 
-#include "content/public/browser/storage_partition.h"
 #include "mojo/public/cpp/system/string_data_source.h"
 #include "native_mate/dictionary.h"
 #include "native_mate/object_template_builder.h"
-#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
 #include "shell/browser/api/atom_api_session.h"
-#include "shell/browser/atom_browser_client.h"
 #include "shell/browser/atom_browser_context.h"
 #include "shell/common/native_mate_converters/gurl_converter.h"
 #include "shell/common/native_mate_converters/net_converter.h"
@@ -179,36 +176,7 @@ URLRequestNS::URLRequestNS(mate::Arguments* args) : weak_factory_(this) {
       session = Session::FromPartition(args->isolate(), "");
   }
 
-  auto* browser_context = session->browser_context();
-  auto* storage_partition =
-      content::BrowserContext::GetDefaultStoragePartition(browser_context);
-
-  network::mojom::URLLoaderFactoryPtr network_factory;
-  mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_request =
-      mojo::MakeRequest(&network_factory);
-
-  // Consult the embedder.
-  network::mojom::TrustedURLLoaderHeaderClientPtrInfo header_client;
-  static_cast<content::ContentBrowserClient*>(AtomBrowserClient::Get())
-      ->WillCreateURLLoaderFactory(browser_context, nullptr, -1,
-                                   true /* is_navigation */,
-                                   false /* is_download */, url::Origin(),
-                                   &factory_request, &header_client, nullptr);
-
-  network::mojom::URLLoaderFactoryParamsPtr params =
-      network::mojom::URLLoaderFactoryParams::New();
-  params->header_client = std::move(header_client);
-  params->process_id = network::mojom::kBrowserProcessId;
-  params->is_corb_enabled = false;
-  // The tests of net module would fail if this setting is true, it seems that
-  // the non-NetworkService implementation always has web security enabled.
-  params->disable_web_security = false;
-
-  storage_partition->GetNetworkContext()->CreateURLLoaderFactory(
-      std::move(factory_request), std::move(params));
-  url_loader_factory_ =
-      base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
-          std::move(network_factory));
+  url_loader_factory_ = session->browser_context()->GetURLLoaderFactory();
 
   InitWith(args->isolate(), args->GetThis());
 }

shell/browser/atom_browser_context.cc

@@ -28,6 +28,7 @@
 #include "content/public/browser/storage_partition.h"
 #include "net/base/escape.h"
 #include "services/network/public/cpp/features.h"
+#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
 #include "shell/browser/atom_blob_reader.h"
 #include "shell/browser/atom_browser_client.h"
 #include "shell/browser/atom_browser_main_parts.h"
@@ -326,6 +327,41 @@ predictors::PreconnectManager* AtomBrowserContext::GetPreconnectManager() {
   return preconnect_manager_.get();
 }
 
+scoped_refptr<network::SharedURLLoaderFactory>
+AtomBrowserContext::GetURLLoaderFactory() {
+  if (url_loader_factory_)
+    return url_loader_factory_;
+
+  network::mojom::URLLoaderFactoryPtr network_factory;
+  mojo::PendingReceiver<network::mojom::URLLoaderFactory> factory_request =
+      mojo::MakeRequest(&network_factory);
+
+  // Consult the embedder.
+  network::mojom::TrustedURLLoaderHeaderClientPtrInfo header_client;
+  static_cast<content::ContentBrowserClient*>(AtomBrowserClient::Get())
+      ->WillCreateURLLoaderFactory(this, nullptr, -1, true, false,
+                                   url::Origin(), &factory_request,
+                                   &header_client, nullptr);
+
+  network::mojom::URLLoaderFactoryParamsPtr params =
+      network::mojom::URLLoaderFactoryParams::New();
+  params->header_client = std::move(header_client);
+  params->process_id = network::mojom::kBrowserProcessId;
+  params->is_corb_enabled = false;
+  // The tests of net module would fail if this setting is true, it seems that
+  // the non-NetworkService implementation always has web security enabled.
+  params->disable_web_security = false;
+
+  auto* storage_partition =
+      content::BrowserContext::GetDefaultStoragePartition(this);
+  storage_partition->GetNetworkContext()->CreateURLLoaderFactory(
+      std::move(factory_request), std::move(params));
+  url_loader_factory_ =
+      base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
+          std::move(network_factory));
+  return url_loader_factory_;
+}
+
 content::PushMessagingService* AtomBrowserContext::GetPushMessagingService() {
   return nullptr;
 }

shell/browser/atom_browser_context.h

@@ -17,6 +17,7 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/resource_context.h"
 #include "electron/buildflags/buildflags.h"
+#include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "shell/browser/media/media_device_id_salt.h"
 #include "shell/browser/net/url_request_context_getter.h"
 
@@ -24,6 +25,10 @@ class PrefRegistrySimple;
 class PrefService;
 class ValueMapPrefStore;
 
+namespace network {
+class SharedURLLoaderFactory;
+}
+
 namespace storage {
 class SpecialStoragePolicy;
 }
@@ -91,8 +96,8 @@ class AtomBrowserContext
   // Get the request context, if there is none, create it.
   net::URLRequestContextGetter* GetRequestContext();
   ResolveProxyHelper* GetResolveProxyHelper();
-
   predictors::PreconnectManager* GetPreconnectManager();
+  scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory();
 
   // content::BrowserContext:
   base::FilePath GetPath() override;
@@ -191,6 +196,9 @@ class AtomBrowserContext
   extensions::AtomExtensionSystem* extension_system_;
 #endif
 
+  // Shared URLLoaderFactory.
+  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
+
   base::WeakPtrFactory<AtomBrowserContext> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);

shell/browser/net/atom_url_loader_factory.cc

@@ -392,12 +392,9 @@ void AtomURLLoaderFactory::StartLoadingHttp(
     }
   }
 
-  scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory =
-      content::BrowserContext::GetDefaultStoragePartition(browser_context.get())
-          ->GetURLLoaderFactoryForBrowserProcess();
   new URLPipeLoader(
-      url_loader_factory, std::move(request), std::move(loader),
-      std::move(client),
+      browser_context->GetURLLoaderFactory(), std::move(request),
+      std::move(loader), std::move(client),
       static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
       std::move(upload_data));
 }