From a3318c84b022282a5a4a2babc51d1e3ca634e25b Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Thu, 21 Apr 2016 16:06:45 +0200
Subject: Fix regenerating job-factory

Only update installed custom url scheme handlers, and leave the rest of
the job factory untouched, so we don't delete the protocol handlers and
request interceptors Chromium passed us, and that are now owned by the
job-factory.

Change-Id: I640527487dda053463f8fa9986ceb47941593f2b
Task-number: QTBUG-52790
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
---
 src/core/url_request_context_getter_qt.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/core/url_request_context_getter_qt.h')

diff --git a/src/core/url_request_context_getter_qt.h b/src/core/url_request_context_getter_qt.h
index 760a71c92..b925232a6 100644
--- a/src/core/url_request_context_getter_qt.h
+++ b/src/core/url_request_context_getter_qt.h
@@ -89,6 +89,7 @@ private:
     void generateHttpCache();
     void generateUserAgent();
     void generateJobFactory();
+    void regenerateJobFactory(const QList<QByteArray> customSchemes);
     void cancelAllUrlRequests();
     net::HttpNetworkSession::Params generateNetworkSessionParams();
 
@@ -104,9 +105,11 @@ private:
     scoped_ptr<NetworkDelegateQt> m_networkDelegate;
     scoped_ptr<net::URLRequestContextStorage> m_storage;
     scoped_ptr<net::URLRequestJobFactory> m_jobFactory;
+    net::URLRequestJobFactoryImpl *m_baseJobFactory;
     scoped_ptr<net::DhcpProxyScriptFetcherFactory> m_dhcpProxyScriptFetcherFactory;
     scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate;
     content::URLRequestInterceptorScopedVector m_requestInterceptors;
+    QList<QByteArray> m_installedCustomSchemes;
 
     friend class NetworkDelegateQt;
 };
-- 
cgit v1.2.3