1 files changed, 19 insertions, 3 deletions
diff --git a/src/core/net/custom_url_loader_factory.cpp b/src/core/net/custom_url_loader_factory.cpp
index 43facd30c..10b4a9e0f 100644
--- a/src/core/net/custom_url_loader_factory.cpp
+++ b/src/core/net/custom_url_loader_factory.cpp
@@ -458,10 +458,13 @@ private:
 
 class CustomURLLoaderFactory : public network::mojom::URLLoaderFactory {
 public:
-    CustomURLLoaderFactory(ProfileAdapter *profileAdapter)
+    CustomURLLoaderFactory(ProfileAdapter *profileAdapter, mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver)
         : m_taskRunner(base::CreateSequencedTaskRunner({ content::BrowserThread::IO }))
         , m_profileAdapter(profileAdapter)
     {
+        m_receivers.set_disconnect_handler(base::BindRepeating(
+            &CustomURLLoaderFactory::OnDisconnect, base::Unretained(this)));
+        m_receivers.Add(this, std::move(receiver));
     }
     ~CustomURLLoaderFactory() override = default;
 
@@ -492,6 +495,19 @@ public:
         m_receivers.Add(this, std::move(receiver));
     }
 
+    void OnDisconnect()
+    {
+        if (m_receivers.empty())
+            delete this;
+    }
+
+    static mojo::PendingRemote<network::mojom::URLLoaderFactory> Create(ProfileAdapter *profileAdapter)
+    {
+        mojo::PendingRemote<network::mojom::URLLoaderFactory> pending_remote;
+        new CustomURLLoaderFactory(profileAdapter, pending_remote.InitWithNewPipeAndPassReceiver());
+        return pending_remote;
+    }
+
     const scoped_refptr<base::SequencedTaskRunner> m_taskRunner;
     mojo::ReceiverSet<network::mojom::URLLoaderFactory> m_receivers;
     QPointer<ProfileAdapter> m_profileAdapter;
@@ -500,9 +516,9 @@ public:
 
 } // namespace
 
-std::unique_ptr<network::mojom::URLLoaderFactory> CreateCustomURLLoaderFactory(ProfileAdapter *profileAdapter)
+mojo::PendingRemote<network::mojom::URLLoaderFactory> CreateCustomURLLoaderFactory(ProfileAdapter *profileAdapter)
 {
-    return std::make_unique<CustomURLLoaderFactory>(profileAdapter);
+    return CustomURLLoaderFactory::Create(profileAdapter);
 }
 
 } // namespace QtWebEngineCore