Remove non-NetworkService support classes

Removes much of the specific code for non-networksupport, classes that
won't work or even compile with 78/79 based.

Change-Id: I150794a55164998fa3d0031757718081fa7d7d9a
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

23 files changed, 59 insertions, 2365 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 987934555..baa08fa7e 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -46,6 +46,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/task/post_task.h"
 #include "base/threading/thread_restrictions.h"
+#include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #if QT_CONFIG(webengine_spellchecker)
 #include "chrome/browser/spellchecker/spell_check_host_chrome_impl.h"
@@ -76,6 +77,7 @@
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/common/url_loader_throttle.h"
 #include "content/public/common/user_agent.h"
 #include "media/media_buildflags.h"
 #include "extensions/buildflags/buildflags.h"
@@ -120,11 +122,9 @@
 #include "media_capture_devices_dispatcher.h"
 #include "net/cookie_monster_delegate_qt.h"
 #include "net/custom_url_loader_factory.h"
-#include "net/network_delegate_qt.h"
 #include "net/proxying_restricted_cookie_manager_qt.h"
 #include "net/proxying_url_loader_factory_qt.h"
 #include "net/qrc_url_scheme_handler.h"
-#include "net/url_request_context_getter_qt.h"
 #include "net/system_network_context_manager.h"
 #include "platform_notification_service_qt.h"
 #if QT_CONFIG(webengine_printing_and_pdf)
@@ -296,17 +296,12 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost*
 {
     const int id = host->GetID();
     Profile *profile = Profile::FromBrowserContext(host->GetBrowserContext());
-    if (profile->GetRequestContext()) {
-        base::PostTaskWithTraitsAndReplyWithResult(
-                FROM_HERE, {content::BrowserThread::IO},
-                base::BindOnce(&net::URLRequestContextGetter::GetURLRequestContext, base::Unretained(profile->GetRequestContext())),
-                base::BindOnce(&ContentBrowserClientQt::AddNetworkHintsMessageFilter, base::Unretained(this), id));
-    }
+
+    host->AddFilter(new network_hints::NetworkHintsMessageFilter(id));
 
     // Allow requesting custom schemes.
     const auto policy = content::ChildProcessSecurityPolicy::GetInstance();
-    const auto profileQt = static_cast<ProfileQt *>(host->GetBrowserContext());
-    const auto profileAdapter = profileQt->profileAdapter();
+    const auto profileAdapter = static_cast<ProfileQt *>(profile)->profileAdapter();
     for (const QByteArray &scheme : profileAdapter->customUrlSchemes())
         policy->GrantRequestScheme(id, scheme.toStdString());
 
@@ -315,12 +310,12 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost*
     profileAdapter->userResourceController()->renderProcessStartedWithHost(host);
     host->AddFilter(new BrowserMessageFilterQt(id, profile));
 #if QT_CONFIG(webengine_printing_and_pdf)
-    host->AddFilter(new PrintingMessageFilterQt(host->GetID()));
+    host->AddFilter(new PrintingMessageFilterQt(id));
 #endif
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-    host->AddFilter(new extensions::ExtensionMessageFilter(host->GetID(), host->GetBrowserContext()));
-    host->AddFilter(new extensions::IOThreadExtensionMessageFilter(host->GetID(), host->GetBrowserContext()));
-    host->AddFilter(new extensions::ExtensionsGuestViewMessageFilter(host->GetID(), host->GetBrowserContext()));
+    host->AddFilter(new extensions::ExtensionMessageFilter(id, profile));
+    host->AddFilter(new extensions::IOThreadExtensionMessageFilter(id, profile));
+    host->AddFilter(new extensions::ExtensionsGuestViewMessageFilter(id, profile));
 #endif //ENABLE_EXTENSIONS
 
     bool is_incognito_process = profile->IsOffTheRecord();
@@ -692,19 +687,6 @@ std::unique_ptr<device::LocationProvider> ContentBrowserClientQt::OverrideSystem
 }
 #endif
 
-void ContentBrowserClientQt::AddNetworkHintsMessageFilter(int render_process_id, net::URLRequestContext *context)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-    content::RenderProcessHost* host = content::RenderProcessHost::FromID(render_process_id);
-    if (!host)
-        return;
-
-    content::BrowserMessageFilter *network_hints_message_filter =
-            new network_hints::NetworkHintsMessageFilter(render_process_id);
-    host->AddFilter(network_hints_message_filter);
-}
-
 bool ContentBrowserClientQt::ShouldEnableStrictSiteIsolation()
 {
     // mirroring AwContentBrowserClient, CastContentBrowserClient and
@@ -720,16 +702,6 @@ bool ContentBrowserClientQt::WillCreateRestrictedCookieManager(network::mojom::R
                                                                int routing_id,
                                                                network::mojom::RestrictedCookieManagerRequest *request)
 {
-    if (Profile::FromBrowserContext(browser_context)->GetRequestContext()) {
-        base::PostTaskWithTraits(
-            FROM_HERE, {content::BrowserThread::IO},
-            base::BindOnce(&ProfileIODataQt::CreateRestrictedCookieManager,
-                           ProfileIODataQt::FromBrowserContext(browser_context)->getWeakPtrOnUIThread(),
-                           std::move(*request),
-                           role, origin, is_service_worker, process_id, routing_id));
-        return true;
-    }
-
     network::mojom::RestrictedCookieManagerRequest orig_request = std::move(*request);
     network::mojom::RestrictedCookieManagerPtrInfo target_rcm_info;
     *request = mojo::MakeRequest(&target_rcm_info);
@@ -909,7 +881,31 @@ ContentBrowserClientQt::CreateURLLoaderThrottles(
     return result;
 }
 
-extern WebContentsAdapterClient::NavigationType pageTransitionToNavigationType(ui::PageTransition transition);
+WebContentsAdapterClient::NavigationType pageTransitionToNavigationType(ui::PageTransition transition)
+{
+    if (ui::PageTransitionIsRedirect(transition))
+        return WebContentsAdapterClient::RedirectNavigation;
+
+    int32_t qualifier = ui::PageTransitionGetQualifier(transition);
+
+    if (qualifier & ui::PAGE_TRANSITION_FORWARD_BACK)
+        return WebContentsAdapterClient::BackForwardNavigation;
+
+    ui::PageTransition strippedTransition = ui::PageTransitionStripQualifier(transition);
+
+    switch (strippedTransition) {
+    case ui::PAGE_TRANSITION_LINK:
+        return WebContentsAdapterClient::LinkNavigation;
+    case ui::PAGE_TRANSITION_TYPED:
+        return WebContentsAdapterClient::TypedNavigation;
+    case ui::PAGE_TRANSITION_FORM_SUBMIT:
+        return WebContentsAdapterClient::FormSubmittedNavigation;
+    case ui::PAGE_TRANSITION_RELOAD:
+        return WebContentsAdapterClient::ReloadNavigation;
+    default:
+        return WebContentsAdapterClient::OtherNavigation;
+    }
+}
 
 static bool navigationThrottleCallback(content::WebContents *source,
                                        const navigation_interception::NavigationParams &params)
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index c6a252562..cd48d6fe5 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -251,7 +251,6 @@ public:
 
 private:
     void InitFrameInterfaces();
-    void AddNetworkHintsMessageFilter(int render_process_id, net::URLRequestContext *context);
 
     std::unique_ptr<content::ResourceDispatcherHostDelegate> m_resourceDispatcherHostDelegate;
     scoped_refptr<ShareGroupQtQuick> m_shareGroupQtQuick;
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index 000cffa50..d317bf625 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -82,22 +82,16 @@ SOURCES = \
         net/client_cert_override.cpp \
         net/client_cert_store_data.cpp \
         net/cookie_monster_delegate_qt.cpp \
-        net/custom_protocol_handler.cpp \
         net/custom_url_loader_factory.cpp \
-        net/network_delegate_qt.cpp \
         net/proxy_config_monitor.cpp \
         net/proxy_config_service_qt.cpp \
         net/proxying_url_loader_factory_qt.cpp \
         net/proxying_restricted_cookie_manager_qt.cpp \
         net/qrc_url_scheme_handler.cpp \
-        net/restricted_cookie_manager_qt.cpp \
         net/ssl_host_state_delegate_qt.cpp \
         net/system_network_context_manager.cpp \
-        net/url_request_context_getter_qt.cpp \
-        net/url_request_custom_job.cpp \
         net/url_request_custom_job_delegate.cpp \
         net/url_request_custom_job_proxy.cpp \
-        net/url_request_notification.cpp \
         net/webui_controller_factory_qt.cpp \
         ozone/gl_context_qt.cpp \
         ozone/gl_ozone_egl_qt.cpp \
@@ -198,20 +192,14 @@ HEADERS = \
         net/client_cert_override.h \
         net/client_cert_store_data.h \
         net/cookie_monster_delegate_qt.h \
-        net/custom_protocol_handler.h \
         net/custom_url_loader_factory.h \
-        net/network_delegate_qt.h \
         net/proxying_url_loader_factory_qt.h \
         net/proxying_restricted_cookie_manager_qt.h \
         net/qrc_url_scheme_handler.h \
-        net/restricted_cookie_manager_qt.h \
         net/ssl_host_state_delegate_qt.h \
         net/system_network_context_manager.h \
-        net/url_request_context_getter_qt.h \
-        net/url_request_custom_job.h \
         net/url_request_custom_job_delegate.h \
         net/url_request_custom_job_proxy.h \
-        net/url_request_notification.h \
         net/webui_controller_factory_qt.h \
         ozone/gl_context_qt.h \
         ozone/gl_ozone_egl_qt.h \
diff --git a/src/core/net/cookie_monster_delegate_qt.cpp b/src/core/net/cookie_monster_delegate_qt.cpp
index e0fa60be7..dba79b4db 100644
--- a/src/core/net/cookie_monster_delegate_qt.cpp
+++ b/src/core/net/cookie_monster_delegate_qt.cpp
@@ -81,7 +81,6 @@ static GURL sourceUrlForCookie(const QNetworkCookie &cookie)
 
 CookieMonsterDelegateQt::CookieMonsterDelegateQt()
     : m_client(0)
-    , m_cookieMonster(nullptr)
     , m_listener(new CookieChangeListener(this))
     , m_binding(m_listener.get())
 {
@@ -104,26 +103,12 @@ void CookieMonsterDelegateQt::AddStore(net::CookieStore *store)
 
 bool CookieMonsterDelegateQt::hasCookieMonster()
 {
-    return m_cookieMonster || m_mojoCookieManager.is_bound();
+    return m_mojoCookieManager.is_bound();
 }
 
 void CookieMonsterDelegateQt::getAllCookies(quint64 callbackId)
 {
-    if (m_mojoCookieManager.is_bound()) {
-        m_mojoCookieManager->GetAllCookies(base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread, this, callbackId));
-    } else {
-        net::CookieMonster::GetCookieListCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesCallbackOnIOThread, this, callbackId);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesOnIOThread, this, std::move(callback)));
-    }
-}
-
-void CookieMonsterDelegateQt::GetAllCookiesOnIOThread(net::CookieMonster::GetCookieListCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_cookieMonster)
-        m_cookieMonster->GetAllCookiesAsync(std::move(callback));
+    m_mojoCookieManager->GetAllCookies(base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread, this, callbackId));
 }
 
 void CookieMonsterDelegateQt::setCookie(quint64 callbackId, const QNetworkCookie &cookie, const QUrl &origin)
@@ -136,31 +121,12 @@ void CookieMonsterDelegateQt::setCookie(quint64 callbackId, const QNetworkCookie
     GURL gurl = origin.isEmpty() ? sourceUrlForCookie(cookie) : toGurl(origin);
     std::string cookie_line = cookie.toRawForm().toStdString();
 
-    if (m_mojoCookieManager.is_bound()) {
-        if (callbackId != CallbackDirectory::NoCallbackId)
-            callback = base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnUIThread, this, callbackId);
-        net::CookieOptions options;
-        options.set_include_httponly();
-        auto cookie = net::CanonicalCookie::Create(gurl, cookie_line, base::Time::Now(), options);
-        m_mojoCookieManager->SetCanonicalCookie(*cookie.get(), gurl.scheme(), options, std::move(callback));
-    } else {
-        if (callbackId != CallbackDirectory::NoCallbackId)
-            callback = base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnIOThread, this, callbackId);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::SetCookieOnIOThread, this,
-                                                gurl, std::move(cookie_line), std::move(callback)));
-    }
-}
-
-void CookieMonsterDelegateQt::SetCookieOnIOThread(const GURL &url, const std::string &cookie_line,
-                                                  net::CookieMonster::SetCookiesCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+    if (callbackId != CallbackDirectory::NoCallbackId)
+        callback = base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnUIThread, this, callbackId);
     net::CookieOptions options;
     options.set_include_httponly();
-
-    if (m_cookieMonster)
-        m_cookieMonster->SetCookieWithOptionsAsync(url, cookie_line, options, std::move(callback));
+    auto canonCookie = net::CanonicalCookie::Create(gurl, cookie_line, base::Time::Now(), options);
+    m_mojoCookieManager->SetCanonicalCookie(*canonCookie.get(), gurl.scheme(), options, std::move(callback));
 }
 
 void CookieMonsterDelegateQt::deleteCookie(const QNetworkCookie &cookie, const QUrl &origin)
@@ -170,69 +136,22 @@ void CookieMonsterDelegateQt::deleteCookie(const QNetworkCookie &cookie, const Q
 
     GURL gurl = origin.isEmpty() ? sourceUrlForCookie(cookie) : toGurl(origin);
     std::string cookie_name = cookie.name().toStdString();
-    if (m_mojoCookieManager.is_bound()) {
-        auto filter = network::mojom::CookieDeletionFilter::New();
-        filter->url = gurl;
-        filter->cookie_name = cookie_name;
-        m_mojoCookieManager->DeleteCookies(std::move(filter), network::mojom::CookieManager::DeleteCookiesCallback());
-    } else {
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::DeleteCookieOnIOThread, this,
-                                                gurl, cookie_name));
-    }
-}
-
-void CookieMonsterDelegateQt::DeleteCookieOnIOThread(const GURL &url, const std::string &cookie_name)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_cookieMonster) {
-        net::CookieMonster::GetCookieListCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::GetCookiesToDeleteCallback, this, cookie_name);
-        m_cookieMonster->GetAllCookiesForURLAsync(url, std::move(callback));
-    }
+    auto filter = network::mojom::CookieDeletionFilter::New();
+    filter->url = gurl;
+    filter->cookie_name = cookie_name;
+    m_mojoCookieManager->DeleteCookies(std::move(filter), network::mojom::CookieManager::DeleteCookiesCallback());
 }
 
-void CookieMonsterDelegateQt::GetCookiesToDeleteCallback(const std::string &cookie_name, const net::CookieList &cookies,
-                                                         const net::CookieStatusList &statusList)
-{
-    Q_UNUSED(statusList);
-    if (!m_cookieMonster)
-        return;
-
-    net::CookieList cookiesToDelete;
-    for (auto cookie : cookies) {
-        if (cookie.Name() == cookie_name)
-            cookiesToDelete.push_back(cookie);
-    }
-    for (auto cookie : cookiesToDelete)
-        m_cookieMonster->DeleteCanonicalCookieAsync(cookie, base::DoNothing());
-}
-
-
 void CookieMonsterDelegateQt::deleteSessionCookies(quint64 callbackId)
 {
     Q_ASSERT(hasCookieMonster());
     Q_ASSERT(m_client);
 
-    if (m_mojoCookieManager.is_bound()) {
-        net::CookieMonster::DeleteCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId);
-        auto filter = network::mojom::CookieDeletionFilter::New();
-        filter->session_control = network::mojom::CookieDeletionSessionControl::SESSION_COOKIES;
-        m_mojoCookieManager->DeleteCookies(std::move(filter), std::move(callback));
-    } else {
-        net::CookieMonster::DeleteCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnIOThread, this, callbackId);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::DeleteSessionCookiesOnIOThread, this, std::move(callback)));
-    }
-}
-
-void CookieMonsterDelegateQt::DeleteSessionCookiesOnIOThread(net::CookieMonster::DeleteCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_cookieMonster)
-        m_cookieMonster->DeleteSessionCookiesAsync(std::move(callback));
+    network::mojom::CookieManager::DeleteCookiesCallback callback =
+        base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId);
+    auto filter = network::mojom::CookieDeletionFilter::New();
+    filter->session_control = network::mojom::CookieDeletionSessionControl::SESSION_COOKIES;
+    m_mojoCookieManager->DeleteCookies(std::move(filter), std::move(callback));
 }
 
 void CookieMonsterDelegateQt::deleteAllCookies(quint64 callbackId)
@@ -240,44 +159,10 @@ void CookieMonsterDelegateQt::deleteAllCookies(quint64 callbackId)
     Q_ASSERT(hasCookieMonster());
     Q_ASSERT(m_client);
 
-    if (m_mojoCookieManager.is_bound()) {
-        net::CookieMonster::DeleteCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId);
-        auto filter = network::mojom::CookieDeletionFilter::New();
-        m_mojoCookieManager->DeleteCookies(std::move(filter), std::move(callback));
-    } else {
-        net::CookieMonster::DeleteCallback callback =
-            base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnIOThread, this, callbackId);
-        base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
-                                 base::BindOnce(&CookieMonsterDelegateQt::DeleteAllOnIOThread, this, std::move(callback)));
-    }
-}
-
-void CookieMonsterDelegateQt::DeleteAllOnIOThread(net::CookieMonster::DeleteCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_cookieMonster)
-        m_cookieMonster->DeleteAllAsync(std::move(callback));
-}
-
-void CookieMonsterDelegateQt::setCookieMonster(net::CookieMonster *monster)
-{
-    if (monster == m_cookieMonster)
-        return;
-
-    m_subscriptions.clear();
-    if (monster)
-        AddStore(monster);
-
-    m_cookieMonster = monster;
-
-    if (!m_client)
-        return;
-
-    if (monster)
-        m_client->d_func()->processPendingUserCookies();
-    else
-        m_client->d_func()->rejectPendingUserCookies();
+    network::mojom::CookieManager::DeleteCookiesCallback callback =
+        base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId);
+    auto filter = network::mojom::CookieDeletionFilter::New();
+    m_mojoCookieManager->DeleteCookies(std::move(filter), std::move(callback));
 }
 
 void CookieMonsterDelegateQt::setMojoCookieManager(network::mojom::CookieManagerPtrInfo cookie_manager_info)
@@ -336,18 +221,6 @@ void CookieMonsterDelegateQt::OnCookieChanged(const net::CanonicalCookie &cookie
     m_client->d_func()->onCookieChanged(toQt(cookie), cause != net::CookieChangeCause::INSERTED);
 }
 
-void CookieMonsterDelegateQt::GetAllCookiesCallbackOnIOThread(qint64 callbackId, const net::CookieList &cookies, const net::CookieStatusList &statusList)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    QByteArray rawCookies;
-    for (auto &&cookie : cookies)
-        rawCookies += toQt(cookie).toRawForm() % QByteArrayLiteral("\n");
-
-    base::PostTaskWithTraits(
-                FROM_HERE, {content::BrowserThread::UI},
-                base::BindOnce(&CookieMonsterDelegateQt::GetAllCookiesResultOnUIThread, this, callbackId, rawCookies));
-}
-
 void CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread(qint64 callbackId, const std::vector<net::CanonicalCookie> &cookies)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ -358,22 +231,6 @@ void CookieMonsterDelegateQt::GetAllCookiesCallbackOnUIThread(qint64 callbackId,
     GetAllCookiesResultOnUIThread(callbackId, rawCookies);
 }
 
-void CookieMonsterDelegateQt::SetCookieCallbackOnIOThread(qint64 callbackId, net::CanonicalCookie::CookieInclusionStatus status)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    base::PostTaskWithTraits(
-                FROM_HERE, {content::BrowserThread::UI},
-                base::BindOnce(&CookieMonsterDelegateQt::SetCookieCallbackOnUIThread, this, callbackId, status));
-}
-
-void CookieMonsterDelegateQt::DeleteCookiesCallbackOnIOThread(qint64 callbackId, uint numCookies)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    base::PostTaskWithTraits(
-                FROM_HERE, {content::BrowserThread::UI},
-                base::BindOnce(&CookieMonsterDelegateQt::DeleteCookiesCallbackOnUIThread, this, callbackId, numCookies));
-}
-
 void CookieMonsterDelegateQt::GetAllCookiesResultOnUIThread(qint64 callbackId, const QByteArray &cookies)
 {
     if (m_client)
diff --git a/src/core/net/cookie_monster_delegate_qt.h b/src/core/net/cookie_monster_delegate_qt.h
index 02c84e061..f7ebe38c2 100644
--- a/src/core/net/cookie_monster_delegate_qt.h
+++ b/src/core/net/cookie_monster_delegate_qt.h
@@ -65,7 +65,8 @@ QT_WARNING_DISABLE_CLANG("-Wunused-parameter")
 #endif
 #include "base/memory/ref_counted.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "net/cookies/cookie_monster.h"
+#include "net/cookies/cookie_change_dispatcher.h"
+#include "net/cookies/cookie_store.h"
 #include "services/network/public/mojom/cookie_manager.mojom-forward.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"
 #ifdef StAsH_signals
@@ -81,18 +82,11 @@ QT_FORWARD_DECLARE_CLASS(QWebEngineCookieStore)
 
 namespace QtWebEngineCore {
 
-// Extends net::CookieMonster::kDefaultCookieableSchemes with qrc, without enabling
-// cookies for the file:// scheme, which is disabled by default in Chromium.
-// Since qrc:// is similar to file:// and there are some unknowns about how
-// to correctly handle file:// cookies, qrc:// should only be used for testing.
-static const char *const kCookieableSchemes[] = { "http", "https", "qrc", "ws", "wss" };
-
 class CookieMonsterDelegateQtPrivate;
 
 class Q_WEBENGINECORE_PRIVATE_EXPORT CookieMonsterDelegateQt : public base::RefCountedThreadSafe<CookieMonsterDelegateQt>
 {
     QPointer<QWebEngineCookieStore> m_client;
-    net::CookieMonster *m_cookieMonster;
     std::vector<std::unique_ptr<net::CookieChangeSubscription>> m_subscriptions;
 
     network::mojom::CookieManagerPtr m_mojoCookieManager;
@@ -110,7 +104,6 @@ public:
     void deleteSessionCookies(quint64 callbackId);
     void deleteAllCookies(quint64 callbackId);
 
-    void setCookieMonster(net::CookieMonster *monster);
     void setClient(QWebEngineCookieStore *client);
     void setMojoCookieManager(network::mojom::CookieManagerPtrInfo cookie_manager_info);
     void unsetMojoCookieManager();
@@ -122,20 +115,6 @@ public:
     void OnCookieChanged(const net::CanonicalCookie &cookie, net::CookieChangeCause cause);
 
 private:
-    void GetAllCookiesOnIOThread(net::CookieMonster::GetCookieListCallback callback);
-    void SetCookieOnIOThread(const GURL &url, const std::string &cookie_line,
-                             net::CookieMonster::SetCookiesCallback callback);
-    void DeleteCookieOnIOThread(const GURL &url, const std::string &cookie_name);
-    void DeleteSessionCookiesOnIOThread(net::CookieMonster::DeleteCallback callback);
-    void DeleteAllOnIOThread(net::CookieMonster::DeleteCallback callback);
-
-    void GetCookiesToDeleteCallback(const std::string &cookie_name, const net::CookieList &cookies,
-                                    const net::CookieStatusList &statusList);
-    void GetAllCookiesCallbackOnIOThread(qint64 callbackId, const net::CookieList &cookies,
-                                         const net::CookieStatusList &statusList);
-    void SetCookieCallbackOnIOThread(qint64 callbackId, net::CanonicalCookie::CookieInclusionStatus status);
-    void DeleteCookiesCallbackOnIOThread(qint64 callbackId, uint numCookies);
-
     void GetAllCookiesCallbackOnUIThread(qint64 callbackId, const std::vector<net::CanonicalCookie> &cookies);
     void GetAllCookiesResultOnUIThread(qint64 callbackId, const QByteArray &cookies);
     void SetCookieCallbackOnUIThread(qint64 callbackId, net::CanonicalCookie::CookieInclusionStatus status);
diff --git a/src/core/net/custom_protocol_handler.cpp b/src/core/net/custom_protocol_handler.cpp
deleted file mode 100644
index 7e8ee47ab..000000000
--- a/src/core/net/custom_protocol_handler.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "custom_protocol_handler.h"
-#include "url_request_custom_job.h"
-
-#include "net/base/net_errors.h"
-#include "net/url_request/url_request.h"
-#include "net/url_request/url_request_error_job.h"
-
-namespace QtWebEngineCore {
-
-CustomProtocolHandler::CustomProtocolHandler(QPointer<ProfileAdapter> profileAdapter)
-    : m_profileAdapter(profileAdapter)
-{
-}
-
-net::URLRequestJob *CustomProtocolHandler::MaybeCreateJob(net::URLRequest *request, net::NetworkDelegate *networkDelegate) const
-{
-    if (!networkDelegate)
-        return new net::URLRequestErrorJob(request, nullptr, net::ERR_ACCESS_DENIED);
-
-    return new URLRequestCustomJob(request, networkDelegate, request->url().scheme(), m_profileAdapter);
-}
-
-} // namespace
diff --git a/src/core/net/custom_protocol_handler.h b/src/core/net/custom_protocol_handler.h
deleted file mode 100644
index 625afc1d5..000000000
--- a/src/core/net/custom_protocol_handler.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#ifndef CUSTOM_PROTOCOL_HANDLER_H_
-#define CUSTOM_PROTOCOL_HANDLER_H_
-
-#include "qtwebenginecoreglobal_p.h"
-#include "net/url_request/url_request_job_factory.h"
-
-#include <QtCore/QByteArray>
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-
-QT_FORWARD_DECLARE_CLASS(QIODevice)
-
-namespace net {
-class NetworkDelegate;
-class URLRequestJob;
-} // namespace
-
-namespace QtWebEngineCore {
-
-class ProfileAdapter;
-
-// Implements a ProtocolHandler for custom URL schemes.
-// If |network_delegate_| is NULL then all file requests will fail with ERR_ACCESS_DENIED.
-class Q_WEBENGINECORE_PRIVATE_EXPORT CustomProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler
-{
-
-public:
-    CustomProtocolHandler(QPointer<ProfileAdapter> profileAdapter);
-
-    net::URLRequestJob *MaybeCreateJob(net::URLRequest *request, net::NetworkDelegate *networkDelegate) const override;
-
-private:
-    DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
-    QPointer<ProfileAdapter> m_profileAdapter;
-};
-
-} // namespace
-
-#endif // CUSTOM_PROTOCOL_HANDLER_H_
diff --git a/src/core/net/network_delegate_qt.cpp b/src/core/net/network_delegate_qt.cpp
deleted file mode 100644
index 684558abb..000000000
--- a/src/core/net/network_delegate_qt.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "network_delegate_qt.h"
-
-#include "base/task/post_task.h"
-#include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/resource_request_info.h"
-#include "net/base/load_flags.h"
-#include "net/url_request/url_request.h"
-#include "ui/base/page_transition_types.h"
-
-#include "profile_adapter.h"
-#include "cookie_monster_delegate_qt.h"
-#include "profile_io_data_qt.h"
-#include "qwebengineurlrequestinfo.h"
-#include "qwebengineurlrequestinfo_p.h"
-#include "qwebengineurlrequestinterceptor.h"
-#include "type_conversion.h"
-#include "web_contents_adapter_client.h"
-#include "web_contents_view_qt.h"
-#include "url_request_notification.h"
-
-namespace QtWebEngineCore {
-
-WebContentsAdapterClient::NavigationType pageTransitionToNavigationType(ui::PageTransition transition)
-{
-    if (ui::PageTransitionIsRedirect(transition))
-        return WebContentsAdapterClient::RedirectNavigation;
-
-    int32_t qualifier = ui::PageTransitionGetQualifier(transition);
-
-    if (qualifier & ui::PAGE_TRANSITION_FORWARD_BACK)
-        return WebContentsAdapterClient::BackForwardNavigation;
-
-    ui::PageTransition strippedTransition = ui::PageTransitionStripQualifier(transition);
-
-    switch (strippedTransition) {
-    case ui::PAGE_TRANSITION_LINK:
-        return WebContentsAdapterClient::LinkNavigation;
-    case ui::PAGE_TRANSITION_TYPED:
-        return WebContentsAdapterClient::TypedNavigation;
-    case ui::PAGE_TRANSITION_FORM_SUBMIT:
-        return WebContentsAdapterClient::FormSubmittedNavigation;
-    case ui::PAGE_TRANSITION_RELOAD:
-        return WebContentsAdapterClient::ReloadNavigation;
-    default:
-        return WebContentsAdapterClient::OtherNavigation;
-    }
-}
-
-static QWebEngineUrlRequestInfo::ResourceType toQt(content::ResourceType resourceType)
-{
-    if (resourceType >= content::ResourceType::kMainFrame && resourceType <= content::ResourceType::kMaxValue)
-        return static_cast<QWebEngineUrlRequestInfo::ResourceType>(resourceType);
-    return QWebEngineUrlRequestInfo::ResourceTypeUnknown;
-}
-
-static QWebEngineUrlRequestInfo::NavigationType toQt(WebContentsAdapterClient::NavigationType navigationType)
-{
-    return static_cast<QWebEngineUrlRequestInfo::NavigationType>(navigationType);
-}
-
-NetworkDelegateQt::NetworkDelegateQt(ProfileIODataQt *data)
-    : m_profileIOData(data)
-{
-}
-
-int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, net::CompletionOnceCallback callback, GURL *newUrl)
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_profileIOData);
-    content::ResourceRequestInfo *resourceInfo = content::ResourceRequestInfo::ForRequest(request);
-
-    content::ResourceType resourceType = content::ResourceType::kMaxValue;
-    WebContentsAdapterClient::NavigationType navigationType = WebContentsAdapterClient::OtherNavigation;
-
-    if (resourceInfo) {
-        resourceType = resourceInfo->GetResourceType();
-        navigationType = pageTransitionToNavigationType(resourceInfo->GetPageTransition());
-    }
-
-    const QUrl qUrl = toQt(request->url());
-
-    QUrl firstPartyUrl = QUrl();
-    if (resourceType == content::ResourceType::kSubFrame)
-        firstPartyUrl = toQt(request->first_party_url());
-    else
-        firstPartyUrl = toQt(request->site_for_cookies());
-
-    const QUrl initiator = request->initiator().has_value() ? toQt(request->initiator()->GetURL()) : QUrl();
-
-    QWebEngineUrlRequestInfoPrivate *infoPrivate = new QWebEngineUrlRequestInfoPrivate(toQt(resourceType),
-                                                                                       toQt(navigationType),
-                                                                                       qUrl,
-                                                                                       firstPartyUrl,
-                                                                                       initiator,
-                                                                                       QByteArray::fromStdString(request->method()));
-    QWebEngineUrlRequestInfo requestInfo(infoPrivate);
-
-    // Deprecated =begin
-    // quick peek if deprecated
-
-    if (m_profileIOData->isInterceptorDeprecated()) {
-        QWebEngineUrlRequestInterceptor *profileInterceptor = m_profileIOData->acquireInterceptor();
-        if (profileInterceptor && m_profileIOData->isInterceptorDeprecated()) {
-            profileInterceptor->interceptRequest(requestInfo);
-            m_profileIOData->releaseInterceptor();
-            if (requestInfo.changed()) {
-                int result = infoPrivate->shouldBlockRequest ? net::ERR_BLOCKED_BY_CLIENT : net::OK;
-
-                if (qUrl != infoPrivate->url)
-                    *newUrl = toGurl(infoPrivate->url);
-
-                if (!infoPrivate->extraHeaders.isEmpty()) {
-                    auto end = infoPrivate->extraHeaders.constEnd();
-                    for (auto header = infoPrivate->extraHeaders.constBegin(); header != end; ++header) {
-                        std::string h = header.key().toStdString();
-                        if (base::LowerCaseEqualsASCII(h, "referer")) {
-                            request->SetReferrer(header.value().toStdString());
-                        } else {
-                            request->SetExtraRequestHeaderByName(h, header.value().toStdString(), /* overwrite */ true);
-                        }
-                    }
-                }
-
-                if (result != net::OK)
-                    return result;
-
-                requestInfo.resetChanged();
-            }
-        } else {
-            m_profileIOData->releaseInterceptor();
-        }
-    }
-    // Deprecated =cut
-
-    if (!resourceInfo)
-        return net::OK;
-
-    // try to bail out
-    if (!m_profileIOData->hasPageInterceptors() && (!m_profileIOData->requestInterceptor() || m_profileIOData->isInterceptorDeprecated()))
-        return net::OK;
-
-    auto webContentsGetter = resourceInfo->GetWebContentsGetterForRequest();
-    new URLRequestNotification(
-        request,
-        resourceInfo->IsMainFrame(),
-        newUrl,
-        std::move(requestInfo),
-        webContentsGetter,
-        std::move(callback),
-        m_profileIOData->profileAdapter()
-    );
-
-    // We'll run the callback after we notified the UI thread.
-    return net::ERR_IO_PENDING;
-}
-
-void NetworkDelegateQt::OnURLRequestDestroyed(net::URLRequest *) {}
-
-void NetworkDelegateQt::OnCompleted(net::URLRequest * /*request*/, bool /*started*/, int /*net_error*/) {}
-
-bool NetworkDelegateQt::OnCanSetCookie(const net::URLRequest &request, const net::CanonicalCookie & /*cookie*/,
-                                       net::CookieOptions *, bool allowedFromCaller)
-{
-    if (!allowedFromCaller)
-        return false;
-    return canSetCookies(request.site_for_cookies(), request.url(), std::string());
-}
-
-bool NetworkDelegateQt::OnCanGetCookies(const net::URLRequest &request, const net::CookieList &, bool allowedFromCaller)
-{
-    if (!allowedFromCaller)
-        return false;
-    return canGetCookies(request.site_for_cookies(), request.url());
-}
-
-bool NetworkDelegateQt::OnForcePrivacyMode(const GURL &url, const GURL &site_for_cookies) const
-{
-    return false;
-    // FIXME: This is what the NetworkContext implementation does (changes tst_QWebEngineCookieStore tests since 72)
-    //    return !canGetCookies(site_for_cookies, url);
-}
-
-bool NetworkDelegateQt::canSetCookies(const GURL &first_party, const GURL &url, const std::string &cookie_line) const
-{
-    Q_ASSERT(m_profileIOData);
-    return m_profileIOData->canSetCookie(toQt(first_party), QByteArray::fromStdString(cookie_line), toQt(url));
-}
-
-bool NetworkDelegateQt::canGetCookies(const GURL &first_party, const GURL &url) const
-{
-    Q_ASSERT(m_profileIOData);
-    return m_profileIOData->canGetCookies(toQt(first_party), toQt(url));
-}
-
-int NetworkDelegateQt::OnBeforeStartTransaction(net::URLRequest *, net::CompletionOnceCallback, net::HttpRequestHeaders *)
-{
-    return net::OK;
-}
-
-void NetworkDelegateQt::OnBeforeSendHeaders(net::URLRequest *request, const net::ProxyInfo &proxy_info,
-                                            const net::ProxyRetryInfoMap &proxy_retry_info,
-                                            net::HttpRequestHeaders *headers)
-{}
-
-void NetworkDelegateQt::OnStartTransaction(net::URLRequest *request, const net::HttpRequestHeaders &headers) {}
-
-int NetworkDelegateQt::OnHeadersReceived(net::URLRequest *, net::CompletionOnceCallback, const net::HttpResponseHeaders *,
-                                         scoped_refptr<net::HttpResponseHeaders> *, GURL *)
-{
-    return net::OK;
-}
-
-void NetworkDelegateQt::OnBeforeRedirect(net::URLRequest *, const GURL &) {}
-
-void NetworkDelegateQt::OnResponseStarted(net::URLRequest *, int) {}
-
-void NetworkDelegateQt::OnNetworkBytesReceived(net::URLRequest *, int64_t) {}
-
-void NetworkDelegateQt::OnNetworkBytesSent(net::URLRequest *, int64_t) {}
-
-void NetworkDelegateQt::OnPACScriptError(int, const base::string16 &) {}
-
-net::NetworkDelegate::AuthRequiredResponse NetworkDelegateQt::OnAuthRequired(net::URLRequest *,
-                                                                             const net::AuthChallengeInfo &,
-                                                                             AuthCallback, net::AuthCredentials *)
-{
-    return AUTH_REQUIRED_RESPONSE_NO_ACTION;
-}
-
-bool NetworkDelegateQt::OnCanAccessFile(const net::URLRequest &, const base::FilePath &, const base::FilePath &) const
-{
-    return true;
-}
-
-bool NetworkDelegateQt::OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest &, const GURL &,
-                                                                            const GURL &) const
-{
-    return false;
-}
-
-bool NetworkDelegateQt::OnCanQueueReportingReport(const url::Origin &origin) const
-{
-    return false;
-}
-
-void NetworkDelegateQt::OnCanSendReportingReports(std::set<url::Origin> origins,
-                                                  base::OnceCallback<void(std::set<url::Origin>)> result_callback) const
-{
-    std::move(result_callback).Run(std::set<url::Origin>());
-}
-
-bool NetworkDelegateQt::OnCanSetReportingClient(const url::Origin &origin, const GURL &endpoint) const
-{
-    return false;
-}
-
-bool NetworkDelegateQt::OnCanUseReportingClient(const url::Origin &origin, const GURL &endpoint) const
-{
-    return false;
-}
-
-} // namespace QtWebEngineCore
diff --git a/src/core/net/network_delegate_qt.h b/src/core/net/network_delegate_qt.h
deleted file mode 100644
index f294c6c7c..000000000
--- a/src/core/net/network_delegate_qt.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef NETWORK_DELEGATE_QT_H
-#define NETWORK_DELEGATE_QT_H
-
-#include "net/base/network_delegate.h"
-#include "net/base/net_errors.h"
-
-#include <QUrl>
-#include <QSet>
-
-namespace content {
-class WebContents;
-}
-
-namespace QtWebEngineCore {
-
-class ProfileIODataQt;
-
-class NetworkDelegateQt : public net::NetworkDelegate
-{
-    ProfileIODataQt *m_profileIOData;
-
-public:
-    NetworkDelegateQt(ProfileIODataQt *data);
-
-    // net::NetworkDelegate implementation
-    int OnBeforeURLRequest(net::URLRequest *request, net::CompletionOnceCallback callback, GURL *new_url) override;
-    void OnURLRequestDestroyed(net::URLRequest *request) override;
-    bool OnCanSetCookie(const net::URLRequest &request, const net::CanonicalCookie &cookie, net::CookieOptions *options,
-                        bool) override;
-    int OnBeforeStartTransaction(net::URLRequest *request, const net::CompletionOnceCallback callback,
-                                 net::HttpRequestHeaders *headers) override;
-    void OnBeforeSendHeaders(net::URLRequest *request, const net::ProxyInfo &proxy_info,
-                             const net::ProxyRetryInfoMap &proxy_retry_info, net::HttpRequestHeaders *headers) override;
-    void OnStartTransaction(net::URLRequest *request, const net::HttpRequestHeaders &headers) override;
-    int OnHeadersReceived(net::URLRequest *, net::CompletionOnceCallback, const net::HttpResponseHeaders *,
-                          scoped_refptr<net::HttpResponseHeaders> *, GURL *) override;
-    void OnBeforeRedirect(net::URLRequest *, const GURL &) override;
-    void OnResponseStarted(net::URLRequest *, int) override;
-    void OnNetworkBytesReceived(net::URLRequest *, int64_t) override;
-    void OnNetworkBytesSent(net::URLRequest *, int64_t) override;
-    void OnCompleted(net::URLRequest *request, bool started, int net_error) override;
-    void OnPACScriptError(int, const base::string16 &) override;
-    net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest *, const net::AuthChallengeInfo &,
-                                                              AuthCallback, net::AuthCredentials *) override;
-    bool OnCanGetCookies(const net::URLRequest &, const net::CookieList &, bool) override;
-    bool OnCanAccessFile(const net::URLRequest &, const base::FilePath &, const base::FilePath &) const override;
-    bool OnForcePrivacyMode(const GURL &, const GURL &) const override;
-    bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest &, const GURL &,
-                                                             const GURL &) const override;
-
-    bool OnCanQueueReportingReport(const url::Origin &origin) const override;
-    void OnCanSendReportingReports(std::set<url::Origin> origins,
-                                   base::OnceCallback<void(std::set<url::Origin>)> result_callback) const override;
-    bool OnCanSetReportingClient(const url::Origin &origin, const GURL &endpoint) const override;
-    bool OnCanUseReportingClient(const url::Origin &origin, const GURL &endpoint) const override;
-
-    bool canSetCookies(const GURL &first_party, const GURL &url, const std::string &cookie_line) const;
-    bool canGetCookies(const GURL &first_party, const GURL &url) const;
-};
-
-} // namespace QtWebEngineCore
-
-#endif // NETWORK_DELEGATE_QT_H
diff --git a/src/core/net/proxying_url_loader_factory_qt.cpp b/src/core/net/proxying_url_loader_factory_qt.cpp
index 173e19eeb..51a226117 100644
--- a/src/core/net/proxying_url_loader_factory_qt.cpp
+++ b/src/core/net/proxying_url_loader_factory_qt.cpp
@@ -60,8 +60,6 @@
 #include "net/http/http_util.h"
 
 #include "api/qwebengineurlrequestinfo_p.h"
-#include "net/url_request_custom_job_proxy.h"
-#include "net/url_request_notification.h"
 #include "profile_io_data_qt.h"
 #include "type_conversion.h"
 #include "web_contents_adapter_client.h"
diff --git a/src/core/net/restricted_cookie_manager_qt.cpp b/src/core/net/restricted_cookie_manager_qt.cpp
deleted file mode 100644
index 7f1ca163e..000000000
--- a/src/core/net/restricted_cookie_manager_qt.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// originally based on android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.cc:
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "restricted_cookie_manager_qt.h"
-
-#include "api/qwebenginecookiestore.h"
-#include "api/qwebenginecookiestore_p.h"
-#include "profile_adapter.h"
-#include "profile_qt.h"
-#include "type_conversion.h"
-
-#include "base/memory/ptr_util.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
-
-namespace QtWebEngineCore {
-
-class RestrictedCookieManagerListenerQt : public network::mojom::CookieChangeListener
-{
-public:
-    RestrictedCookieManagerListenerQt(const GURL &url,
-                                      const GURL &site_for_cookies,
-                                      base::WeakPtr<RestrictedCookieManagerQt> restricted_cookie_manager,
-                                      network::mojom::CookieChangeListenerPtr client_listener)
-            : url_(url)
-            , site_for_cookies_(site_for_cookies)
-            , restricted_cookie_manager_(restricted_cookie_manager)
-            , client_listener_(std::move(client_listener))
-    {}
-
-    void OnCookieChange(const net::CanonicalCookie &cookie, network::mojom::CookieChangeCause cause) override
-    {
-        if (restricted_cookie_manager_ && restricted_cookie_manager_->allowCookies(url_, site_for_cookies_))
-            client_listener_->OnCookieChange(cookie, cause);
-    }
-
-private:
-    const GURL url_;
-    const GURL site_for_cookies_;
-    base::WeakPtr<RestrictedCookieManagerQt> restricted_cookie_manager_;
-    network::mojom::CookieChangeListenerPtr client_listener_;
-};
-
-RestrictedCookieManagerQt::RestrictedCookieManagerQt(base::WeakPtr<ProfileIODataQt> profileIoData,
-                                                     network::mojom::RestrictedCookieManagerRole role,
-                                                     net::CookieStore *cookie_store,
-                                                     network::CookieSettings *cookie_settings,
-                                                     const url::Origin &origin,
-                                                     bool is_service_worker,
-                                                     int32_t process_id,
-                                                     int32_t frame_id)
-        : network::RestrictedCookieManager(role, cookie_store, cookie_settings, origin,
-                                           nullptr, is_service_worker, process_id, frame_id)
-        , m_profileIoData(profileIoData)
-        , weak_factory_(this)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-}
-
-RestrictedCookieManagerQt::~RestrictedCookieManagerQt()
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-}
-
-void RestrictedCookieManagerQt::GetAllForUrl(const GURL &url,
-                                             const GURL &site_for_cookies,
-                                             network::mojom::CookieManagerGetOptionsPtr options,
-                                             GetAllForUrlCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-    if (allowCookies(url, site_for_cookies)) {
-        network::RestrictedCookieManager::GetAllForUrl(url, site_for_cookies, std::move(options), std::move(callback));
-    } else {
-        std::move(callback).Run(std::vector<net::CanonicalCookie>());
-    }
-}
-
-void RestrictedCookieManagerQt::SetCanonicalCookie(const net::CanonicalCookie &cookie,
-                                                   const GURL &url,
-                                                   const GURL &site_for_cookies,
-                                                   SetCanonicalCookieCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-    if (allowCookies(url, site_for_cookies)) {
-        network::RestrictedCookieManager::SetCanonicalCookie(cookie, url, site_for_cookies, std::move(callback));
-    } else {
-        std::move(callback).Run(false);
-    }
-}
-
-void RestrictedCookieManagerQt::AddChangeListener(const GURL &url,
-                                                  const GURL &site_for_cookies,
-                                                  network::mojom::CookieChangeListenerPtr listener,
-                                                  AddChangeListenerCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-    network::mojom::CookieChangeListenerPtr proxy_listener_ptr;
-    auto proxy_listener =
-          std::make_unique<RestrictedCookieManagerListenerQt>(
-                url, site_for_cookies, weak_factory_.GetWeakPtr(),
-                std::move(listener));
-
-    mojo::MakeStrongBinding(std::move(proxy_listener),
-                            mojo::MakeRequest(&proxy_listener_ptr));
-
-    network::RestrictedCookieManager::AddChangeListener(
-                url, site_for_cookies, std::move(proxy_listener_ptr),
-                std::move(callback));
-}
-
-void RestrictedCookieManagerQt::GetCookiesString(const GURL &url,
-                                                 const GURL &site_for_cookies,
-                                                 GetCookiesStringCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-    if (allowCookies(url, site_for_cookies)) {
-        network::RestrictedCookieManager::GetCookiesString(url, site_for_cookies, std::move(callback));
-    } else {
-        std::move(callback).Run("");
-    }
-}
-
-void RestrictedCookieManagerQt::CookiesEnabledFor(const GURL &url,
-                                                  const GURL &site_for_cookies,
-                                                  CookiesEnabledForCallback callback)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    std::move(callback).Run(allowCookies(url, site_for_cookies));
-}
-
-bool RestrictedCookieManagerQt::allowCookies(const GURL &url, const GURL &site_for_cookies) const
-{
-    if (!m_profileIoData)
-        return false;
-    return m_profileIoData->canGetCookies(toQt(site_for_cookies), toQt(url));
-}
-
-} // namespace QtWebEngineCore
diff --git a/src/core/net/restricted_cookie_manager_qt.h b/src/core/net/restricted_cookie_manager_qt.h
deleted file mode 100644
index c135a1795..000000000
--- a/src/core/net/restricted_cookie_manager_qt.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef RESTRICTED_COOKIE_MANAGER_QT_H
-#define RESTRICTED_COOKIE_MANAGER_QT_H
-
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "services/network/restricted_cookie_manager.h"
-#include "url/gurl.h"
-
-namespace QtWebEngineCore {
-
-class ProfileIODataQt;
-
-class RestrictedCookieManagerQt : public network::RestrictedCookieManager
-{
-public:
-    RestrictedCookieManagerQt(base::WeakPtr<ProfileIODataQt> profileIoData,
-                              network::mojom::RestrictedCookieManagerRole role,
-                              net::CookieStore *cookie_store,
-                              network::CookieSettings *cookie_settings,
-                              const url::Origin &origin,
-                              bool is_service_worker,
-                              int32_t process_id,
-                              int32_t frame_id);
-    ~RestrictedCookieManagerQt() override;
-
-    // network::RestrictedCookieManager:
-    void GetAllForUrl(const GURL &url,
-                      const GURL &site_for_cookies,
-                      network::mojom::CookieManagerGetOptionsPtr options,
-                      GetAllForUrlCallback callback) override;
-    void SetCanonicalCookie(const net::CanonicalCookie& cookie,
-                            const GURL &url,
-                            const GURL &site_for_cookies,
-                            SetCanonicalCookieCallback callback) override;
-    void AddChangeListener(const GURL &url,
-                           const GURL &site_for_cookies,
-                           network::mojom::CookieChangeListenerPtr listener,
-                           AddChangeListenerCallback callback) override;
-
-    void GetCookiesString(const GURL &url,
-                          const GURL &site_for_cookies,
-                          GetCookiesStringCallback callback) override;
-
-    void CookiesEnabledFor(const GURL &url,
-                           const GURL &site_for_cookies,
-                           CookiesEnabledForCallback callback) override;
-
-    // Internal:
-    bool allowCookies(const GURL &url, const GURL &site_for_cookies) const;
-
-private:
-    base::WeakPtr<ProfileIODataQt> m_profileIoData;
-
-    base::WeakPtrFactory<RestrictedCookieManagerQt> weak_factory_;
-
-    DISALLOW_COPY_AND_ASSIGN(RestrictedCookieManagerQt);
-};
-
-} // namespace QtWebEngineCore
-
-#endif // RESTRICTED_COOKIE_MANAGER_QT_H
diff --git a/src/core/net/url_request_context_getter_qt.cpp b/src/core/net/url_request_context_getter_qt.cpp
deleted file mode 100644
index 6081a5e9f..000000000
--- a/src/core/net/url_request_context_getter_qt.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "url_request_context_getter_qt.h"
-#include "profile_io_data_qt.h"
-
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-
-namespace QtWebEngineCore {
-
-URLRequestContextGetterQt::URLRequestContextGetterQt(ProfileIODataQt *data)
-    : m_profileIOData(data)
-{
-}
-
-URLRequestContextGetterQt::~URLRequestContextGetterQt()
-{
-}
-
-net::URLRequestContext *URLRequestContextGetterQt::GetURLRequestContext()
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    return m_profileIOData->urlRequestContext();
-}
-
-scoped_refptr<base::SingleThreadTaskRunner> URLRequestContextGetterQt::GetNetworkTaskRunner() const
-{
-    return base::CreateSingleThreadTaskRunnerWithTraits({content::BrowserThread::IO});
-}
-
-} // namespace QtWebEngineCore
diff --git a/src/core/net/url_request_context_getter_qt.h b/src/core/net/url_request_context_getter_qt.h
deleted file mode 100644
index a6ef6eae0..000000000
--- a/src/core/net/url_request_context_getter_qt.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef URL_REQUEST_CONTEXT_GETTER_QT_H
-#define URL_REQUEST_CONTEXT_GETTER_QT_H
-
-#include "net/url_request/url_request_context_getter.h"
-
-namespace QtWebEngineCore {
-
-class ProfileIODataQt;
-
-class URLRequestContextGetterQt : public net::URLRequestContextGetter
-{
-public:
-    URLRequestContextGetterQt(ProfileIODataQt *data);
-    net::URLRequestContext *GetURLRequestContext() override;
-    scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const override;
-
-private:
-    virtual ~URLRequestContextGetterQt();
-    ProfileIODataQt *m_profileIOData;
-};
-
-} // namespace QtWebEngineCore
-
-#endif // URL_REQUEST_CONTEXT_GETTER_QT_H
diff --git a/src/core/net/url_request_custom_job.cpp b/src/core/net/url_request_custom_job.cpp
deleted file mode 100644
index 1f6e6abf7..000000000
--- a/src/core/net/url_request_custom_job.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "url_request_custom_job.h"
-#include "url_request_custom_job_proxy.h"
-
-#include "api/qwebengineurlscheme.h"
-
-#include "base/strings/stringprintf.h"
-#include "base/task/post_task.h"
-#include "content/public/browser/browser_task_traits.h"
-#include "content/public/browser/browser_thread.h"
-#include "net/base/io_buffer.h"
-#include "net/http/http_util.h"
-
-#include <QIODevice>
-
-using namespace net;
-
-namespace QtWebEngineCore {
-
-URLRequestCustomJob::URLRequestCustomJob(URLRequest *request,
-                                         NetworkDelegate *networkDelegate,
-                                         const std::string &scheme,
-                                         QPointer<ProfileAdapter> profileAdapter)
-    : URLRequestJob(request, networkDelegate)
-    , m_taskRunner(base::CreateSingleThreadTaskRunner({ content::BrowserThread::IO }))
-    , m_proxy(new URLRequestCustomJobProxy(this, scheme, profileAdapter))
-    , m_pendingReadSize(0)
-    , m_pendingReadPos(0)
-    , m_pendingReadBuffer(nullptr)
-    , m_corsEnabled(QWebEngineUrlScheme::schemeByName(QByteArray::fromStdString(scheme))
-                    .flags().testFlag(QWebEngineUrlScheme::CorsEnabled))
-{
-    m_device = nullptr;
-    m_firstBytePosition = 0;
-    m_error = 0;
-}
-
-URLRequestCustomJob::~URLRequestCustomJob()
-{
-    m_proxy->m_client = nullptr;
-    if (m_device && m_device->isOpen())
-        m_device->close();
-    m_device = nullptr;
-    base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                             base::BindOnce(&URLRequestCustomJobProxy::release, m_proxy));
-}
-
-void URLRequestCustomJob::Start()
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    HttpRequestHeaders requestHeaders = request()->extra_request_headers();
-    std::map<std::string, std::string> headers;
-    net::HttpRequestHeaders::Iterator it(requestHeaders);
-    while (it.GetNext())
-        headers.emplace(it.name(), it.value());
-    if (!request()->referrer().empty())
-        headers.emplace("Referer", request()->referrer());
-
-    // TODO: handle UploadDataStream, for instance using a QIODevice wrapper.
-
-    base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                             base::BindOnce(&URLRequestCustomJobProxy::initialize,
-                                            m_proxy,
-                                            request()->url(),
-                                            request()->method(),
-                                            request()->initiator(),
-                                            std::move(headers)));
-}
-
-void URLRequestCustomJob::Kill()
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    m_proxy->m_client = nullptr;
-    if (m_device && m_device->isOpen())
-        m_device->close();
-    if (m_pendingReadBuffer) {
-        m_pendingReadBuffer->Release();
-        m_pendingReadBuffer = nullptr;
-        m_pendingReadSize = 0;
-        m_pendingReadPos = 0;
-    }
-    m_device = nullptr;
-    base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                                     base::BindOnce(&URLRequestCustomJobProxy::release,
-                                                    m_proxy));
-    URLRequestJob::Kill();
-}
-
-bool URLRequestCustomJob::GetMimeType(std::string *mimeType) const
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_mimeType.size() > 0) {
-        *mimeType = m_mimeType;
-        return true;
-    }
-    return false;
-}
-
-bool URLRequestCustomJob::GetCharset(std::string *charset)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_charset.size() > 0) {
-        *charset = m_charset;
-        return true;
-    }
-    return false;
-}
-
-void URLRequestCustomJob::GetResponseInfo(HttpResponseInfo *info)
-{
-    // Based on net::URLRequestRedirectJob::StartAsync()
-
-    if (m_error)
-        return;
-
-    std::string headers;
-    if (m_redirect.is_valid()) {
-        headers += "HTTP/1.1 303 See Other\n";
-        headers += base::StringPrintf("Location: %s\n", m_redirect.spec().c_str());
-    } else {
-        headers += base::StringPrintf("HTTP/1.1 %i OK\n", 200);
-        if (m_mimeType.size() > 0) {
-            headers += base::StringPrintf("Content-Type: %s", m_mimeType.c_str());
-            if (m_charset.size() > 0)
-                headers += base::StringPrintf("; charset=%s", m_charset.c_str());
-            headers += "\n";
-        }
-    }
-    if (m_corsEnabled) {
-        std::string origin;
-        if (request_->extra_request_headers().GetHeader("Origin", &origin)) {
-            headers += base::StringPrintf("Access-Control-Allow-Origin: %s\n", origin.c_str());
-            headers += "Access-Control-Allow-Credentials: true\n";
-        }
-    }
-
-    info->headers = new HttpResponseHeaders(HttpUtil::AssembleRawHeaders(headers));
-}
-
-bool URLRequestCustomJob::IsRedirectResponse(GURL *location, int *http_status_code, bool * /*insecure_scheme_was_upgraded*/)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_redirect.is_valid()) {
-        *location = m_redirect;
-        *http_status_code = 303;
-        return true;
-    }
-    return false;
-}
-
-void URLRequestCustomJob::SetExtraRequestHeaders(const HttpRequestHeaders &headers)
-{
-    std::string rangeHeader;
-    if (headers.GetHeader(HttpRequestHeaders::kRange, &rangeHeader)) {
-        std::vector<HttpByteRange> ranges;
-        if (HttpUtil::ParseRangeHeader(rangeHeader, &ranges)) {
-            // Chromium doesn't support multiple range requests in one single URL request.
-            if (ranges.size() == 1)
-                m_firstBytePosition = ranges[0].first_byte_position();
-        }
-    }
-}
-
-int URLRequestCustomJob::ReadRawData(IOBuffer *buf, int bufSize)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (m_error)
-        return m_error;
-    qint64 rv = m_device ? m_device->read(buf->data(), bufSize) : -1;
-    if (rv > 0) {
-        return static_cast<int>(rv);
-    } else if (rv == 0) {
-        // Returning zero is interpreted as EOF by Chromium, so only
-        // return zero if we are the end of the file.
-        if (m_device->atEnd())
-            return 0;
-        // Otherwise return IO_PENDING and call ReadRawDataComplete when we have data
-        // for them.
-        buf->AddRef();
-        m_pendingReadPos = 0;
-        m_pendingReadSize = bufSize;
-        m_pendingReadBuffer = buf;
-        return ERR_IO_PENDING;
-    } else {
-        // QIODevice::read might have called fail on us.
-        if (m_error)
-            return m_error;
-        if (m_device && m_device->atEnd())
-            return 0;
-        return ERR_FAILED;
-    }
-}
-
-void URLRequestCustomJob::notifyExpectedContentSize(qint64 size)
-{
-    set_expected_content_size(size);
-}
-
-void URLRequestCustomJob::notifyHeadersComplete()
-{
-    NotifyHeadersComplete();
-}
-
-void URLRequestCustomJob::notifyCanceled()
-{
-    NotifyCanceled();
-}
-
-void URLRequestCustomJob::notifyAborted()
-{
-    NotifyStartError(URLRequestStatus(URLRequestStatus::CANCELED, net::ERR_ABORTED));
-}
-
-void URLRequestCustomJob::notifyStartFailure(int error)
-{
-    NotifyStartError(URLRequestStatus::FromError(error));
-}
-
-void URLRequestCustomJob::notifyReadyRead()
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    if (!m_device)
-        return;
-    if (!m_pendingReadSize)
-        return;
-    Q_ASSERT(m_pendingReadBuffer);
-    if (!m_pendingReadBuffer)
-        return;
-
-    qint64 rv = m_device->read(m_pendingReadBuffer->data() + m_pendingReadPos, m_pendingReadSize - m_pendingReadPos);
-    if (rv == 0)
-        return;
-    if (rv < 0) {
-        if (m_error)
-            rv = m_error;
-        else if (m_device->atEnd())
-            rv = 0;
-        else
-            rv = ERR_FAILED;
-    } else {
-        m_pendingReadPos += rv;
-        if (m_pendingReadPos < m_pendingReadSize && !m_device->atEnd())
-            return;
-        rv = m_pendingReadPos;
-    }
-    // killJob may be called from ReadRawDataComplete
-    net::IOBuffer *buf = m_pendingReadBuffer;
-    m_pendingReadBuffer = nullptr;
-    m_pendingReadSize = 0;
-    m_pendingReadPos = 0;
-    ReadRawDataComplete(rv);
-    buf->Release();
-}
-
-base::TaskRunner *URLRequestCustomJob::taskRunner()
-{
-    return m_taskRunner.get();
-}
-
-} // namespace
diff --git a/src/core/net/url_request_custom_job.h b/src/core/net/url_request_custom_job.h
deleted file mode 100644
index 517f68c3f..000000000
--- a/src/core/net/url_request_custom_job.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef URL_REQUEST_CUSTOM_JOB_H_
-#define URL_REQUEST_CUSTOM_JOB_H_
-
-#include "net/url_request/url_request_job.h"
-#include "url/gurl.h"
-
-#include "url_request_custom_job_proxy.h"
-
-#include <QtCore/QPointer>
-
-QT_FORWARD_DECLARE_CLASS(QIODevice)
-
-namespace QtWebEngineCore {
-
-class ProfileAdapter;
-class URLRequestCustomJobDelegate;
-class URLRequestCustomJobProxy;
-
-// A request job that handles reading custom URL schemes
-class URLRequestCustomJob : public net::URLRequestJob, private URLRequestCustomJobProxy::Client
-{
-public:
-    URLRequestCustomJob(net::URLRequest *request,
-                        net::NetworkDelegate *networkDelegate,
-                        const std::string &scheme,
-                        QPointer<ProfileAdapter> profileAdapter);
-    // net::URLRequestJob:
-    void Start() override;
-    void Kill() override;
-    int ReadRawData(net::IOBuffer *buf, int buf_size) override;
-    bool GetMimeType(std::string *mimeType) const override;
-    bool GetCharset(std::string *charset) override;
-    void GetResponseInfo(net::HttpResponseInfo *info) override;
-    bool IsRedirectResponse(GURL *location, int *http_status_code, bool *insecure_scheme_was_upgraded) override;
-    void SetExtraRequestHeaders(const net::HttpRequestHeaders &headers) override;
-
-protected:
-    virtual ~URLRequestCustomJob();
-
-private:
-    // URLRequestCustomJobProxy::Client:
-    void notifyExpectedContentSize(qint64 size) override;
-    void notifyHeadersComplete() override;
-    void notifyCanceled() override;
-    void notifyAborted() override;
-    void notifyStartFailure(int error) override;
-    void notifyReadyRead() override;
-    base::TaskRunner *taskRunner() override;
-
-    scoped_refptr<base::TaskRunner> m_taskRunner;
-    scoped_refptr<URLRequestCustomJobProxy> m_proxy;
-    int m_pendingReadSize;
-    int m_pendingReadPos;
-    net::IOBuffer *m_pendingReadBuffer;
-    const bool m_corsEnabled;
-
-    friend class URLRequestCustomJobProxy;
-
-    DISALLOW_COPY_AND_ASSIGN(URLRequestCustomJob);
-};
-} // namespace QtWebEngineCore
-
-#endif // URL_REQUEST_CUSTOM_JOB_H_
diff --git a/src/core/net/url_request_notification.cpp b/src/core/net/url_request_notification.cpp
deleted file mode 100644
index 74c56254e..000000000
--- a/src/core/net/url_request_notification.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "url_request_notification.h"
-
-#include "base/supports_user_data.h"
-#include "base/task/post_task.h"
-#include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/browser/browser_thread.h"
-#include "net/url_request/url_request.h"
-
-#include "api/qwebengineurlrequestinfo_p.h"
-#include "profile_io_data_qt.h"
-#include "type_conversion.h"
-#include "web_contents_adapter_client.h"
-#include "web_contents_view_qt.h"
-
-#include <QVariant>
-
-namespace QtWebEngineCore {
-
-// Calls cancel() when the URLRequest is destroyed.
-class UserData : public base::SupportsUserData::Data
-{
-public:
-    UserData(URLRequestNotification *ptr) : m_ptr(ptr) {}
-    ~UserData() { m_ptr->cancel(); }
-    static const char key[];
-
-private:
-    URLRequestNotification *m_ptr;
-};
-
-const char UserData::key[] = "QtWebEngineCore::URLRequestNotification";
-
-URLRequestNotification::URLRequestNotification(net::URLRequest *request, bool isMainFrameRequest, GURL *newUrl,
-                                               QWebEngineUrlRequestInfo &&requestInfo,
-                                               content::ResourceRequestInfo::WebContentsGetter webContentsGetter,
-                                               net::CompletionOnceCallback callback, QPointer<ProfileAdapter> adapter)
-    : m_request(request)
-    , m_isMainFrameRequest(isMainFrameRequest)
-    , m_newUrl(newUrl)
-    , m_originalUrl(requestInfo.requestUrl())
-    , m_requestInfo(std::move(requestInfo))
-    , m_webContentsGetter(webContentsGetter)
-    , m_callback(std::move(callback))
-    , m_profileAdapter(adapter)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-    m_request->SetUserData(UserData::key, std::make_unique<UserData>(this));
-
-    base::PostTaskWithTraits(
-        FROM_HERE,
-        {content::BrowserThread::UI},
-        base::BindOnce(&URLRequestNotification::notify, base::Unretained(this)));
-}
-
-
-void URLRequestNotification::notify()
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-    // May run concurrently with cancel() so no peeking at m_request here.
-
-    int result = net::OK;
-    content::WebContents *webContents = m_webContentsGetter.Run();
-
-    if (webContents) {
-        if (m_profileAdapter && m_profileAdapter->requestInterceptor()) {
-            QWebEngineUrlRequestInterceptor *interceptor = m_profileAdapter->requestInterceptor();
-            if (!interceptor->property("deprecated").toBool())
-                interceptor->interceptRequest(m_requestInfo);
-        }
-
-        WebContentsAdapterClient *client =
-            WebContentsViewQt::from(static_cast<content::WebContentsImpl*>(webContents)->GetView())->client();
-
-        if (!m_requestInfo.changed()) {
-            client->interceptRequest(m_requestInfo);
-        }
-
-        if (m_requestInfo.changed()) {
-            result = m_requestInfo.d_ptr->shouldBlockRequest ? net::ERR_BLOCKED_BY_CLIENT : net::OK;
-            // We handle the rest of the changes later when we are back in I/O thread
-        }
-    }
-
-    // Run the callback on the IO thread.
-    base::PostTaskWithTraits(
-        FROM_HERE,
-        {content::BrowserThread::IO},
-        base::BindOnce(&URLRequestNotification::complete, base::Unretained(this), result));
-}
-
-void URLRequestNotification::cancel()
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-    // May run concurrently with notify() but we only touch m_request here.
-
-    m_request = nullptr;
-}
-
-void URLRequestNotification::complete(int error)
-{
-    DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-    if (m_request) {
-        if (m_requestInfo.changed()) {
-            if (m_originalUrl != m_requestInfo.d_ptr->url)
-                *m_newUrl = toGurl(m_requestInfo.d_ptr->url);
-
-            if (!m_requestInfo.d_ptr->extraHeaders.isEmpty()) {
-                auto end = m_requestInfo.d_ptr->extraHeaders.constEnd();
-                for (auto header = m_requestInfo.d_ptr->extraHeaders.constBegin(); header != end; ++header) {
-                    std::string h = header.key().toStdString();
-                    if (base::LowerCaseEqualsASCII(h, "referer")) {
-                        m_request->SetReferrer(header.value().toStdString());
-                    } else {
-                        m_request->SetExtraRequestHeaderByName(h, header.value().toStdString(), /* overwrite */ true);
-                    }
-                }
-            }
-        }
-
-        if (m_request->status().status() != net::URLRequestStatus::CANCELED)
-            std::move(m_callback).Run(error);
-        m_request->RemoveUserData(UserData::key);
-    }
-
-    delete this;
-}
-
-}
diff --git a/src/core/net/url_request_notification.h b/src/core/net/url_request_notification.h
deleted file mode 100644
index 673e07bf0..000000000
--- a/src/core/net/url_request_notification.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef URL_REQUEST_NOTIFIACTION_H
-#define URL_REQUEST_NOTIFIACTION_H
-
-#include "content/public/browser/resource_request_info.h"
-#include "net/base/completion_once_callback.h"
-#include "qwebengineurlrequestinfo.h"
-#include <QPointer>
-
-class GURL;
-
-namespace net {
-class URLRequest;
-}
-
-namespace QtWebEngineCore {
-
-class ProfileAdapter;
-class ProfileIoDataQt;
-
-// Notifies WebContentsAdapterClient of a new URLRequest.
-class URLRequestNotification
-{
-public:
-    URLRequestNotification(net::URLRequest *request,
-                           bool isMainFrameRequest,
-                           GURL *newUrl,
-                           QWebEngineUrlRequestInfo &&requestInfo,
-                           content::ResourceRequestInfo::WebContentsGetter webContentsGetter,
-                           net::CompletionOnceCallback callback,
-                           QPointer<ProfileAdapter> adapter);
-    ~URLRequestNotification() = default;
-    void cancel();
-    void notify();
-    void complete(int error);
-
-private:
-    net::URLRequest *m_request; //used only by io thread
-    bool m_isMainFrameRequest;
-    GURL *m_newUrl;
-    const QUrl m_originalUrl;
-    QWebEngineUrlRequestInfo m_requestInfo;
-    content::ResourceRequestInfo::WebContentsGetter m_webContentsGetter;
-    net::CompletionOnceCallback m_callback;
-    QPointer<ProfileAdapter> m_profileAdapter;
-};
-}
-#endif
diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp
index ba2f97475..80edf40bf 100644
--- a/src/core/profile_adapter.cpp
+++ b/src/core/profile_adapter.cpp
@@ -47,7 +47,6 @@
 #include "api/qwebengineurlscheme.h"
 #include "content_browser_client_qt.h"
 #include "download_manager_delegate_qt.h"
-#include "net/url_request_context_getter_qt.h"
 #include "permission_manager_qt.h"
 #include "profile_adapter_client.h"
 #include "profile_qt.h"
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp
index aaaeb277b..ef8f30e10 100644
--- a/src/core/profile_io_data_qt.cpp
+++ b/src/core/profile_io_data_qt.cpp
@@ -40,137 +40,36 @@
 #include "profile_io_data_qt.h"
 
 #include "base/task/post_task.h"
-#include "chrome/common/chrome_constants.h"
-#include "components/certificate_transparency/ct_known_logs.h"
-#include "components/network_session_configurator/common/network_features.h"
+#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browsing_data_remover.h"
-#include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/shared_cors_origin_access_list.h"
 #include "content/public/common/content_features.h"
-#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
-#include "chrome/common/chrome_switches.h"
 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
-#include "net/cert/cert_verifier.h"
-#include "net/cert/ct_log_verifier.h"
-#include "net/cert/ct_policy_enforcer.h"
-#include "net/cert/multi_log_ct_verifier.h"
-#include "net/cert_net/cert_net_fetcher_impl.h"
-#include "net/ftp/ftp_auth_cache.h"
-#include "net/dns/host_resolver_manager.h"
-#include "net/http/http_auth_handler_factory.h"
-#include "net/http/http_auth_scheme.h"
-#include "net/http/http_auth_preferences.h"
-#include "net/http/http_cache.h"
-#include "net/http/http_server_properties_impl.h"
-#include "net/http/http_network_session.h"
-#include "net/http/transport_security_persister.h"
-#include "net/proxy_resolution/dhcp_pac_file_fetcher_factory.h"
-#include "net/proxy_resolution/pac_file_fetcher_impl.h"
 #include "net/proxy_resolution/proxy_config_service.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
-#include "net/url_request/data_protocol_handler.h"
-#include "net/url_request/file_protocol_handler.h"
-#include "net/url_request/ftp_protocol_handler.h"
-#include "net/url_request/static_http_user_agent_settings.h"
-#include "net/url_request/url_request_context_storage.h"
-#include "net/url_request/url_request_job_factory_impl.h"
-#include "net/url_request/url_request_intercepting_job_factory.h"
 #include "services/file/user_id_map.h"
 #include "services/network/proxy_service_mojo.h"
-#include "services/network/restricted_cookie_manager.h"
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/cpp/cors/origin_access_list.h"
 
 #include "net/client_cert_override.h"
 #include "net/client_cert_store_data.h"
 #include "net/cookie_monster_delegate_qt.h"
-#include "net/custom_protocol_handler.h"
-#include "net/network_delegate_qt.h"
 #include "net/proxy_config_service_qt.h"
-#include "net/restricted_cookie_manager_qt.h"
 #include "net/system_network_context_manager.h"
-#include "net/url_request_context_getter_qt.h"
 #include "profile_qt.h"
 #include "resource_context_qt.h"
 #include "type_conversion.h"
 
-#if defined(USE_NSS_CERTS)
-#include "net/cert_net/nss_ocsp.h"
-#endif
-
-#if defined(OS_LINUX) || defined(OS_MACOSX)
-#include "net/cert/cert_net_fetcher.h"
-#include "net/cert_net/cert_net_fetcher_impl.h"
-#endif
-
 #include <mutex>
 #include <QVariant>
 
 namespace QtWebEngineCore {
 
-static scoped_refptr<net::CertNetFetcherImpl> s_certNetFetcher;
-
-static bool doNetworkSessionParamsMatch(const net::HttpNetworkSession::Params &first,
-                                        const net::HttpNetworkSession::Params &second)
-{
-    if (first.ignore_certificate_errors != second.ignore_certificate_errors)
-        return false;
-    return true;
-}
-
-static bool doNetworkSessionContextMatch(const net::HttpNetworkSession::Context &first,
-                                         const net::HttpNetworkSession::Context &second)
-{
-    if (first.transport_security_state != second.transport_security_state)
-        return false;
-    if (first.cert_verifier != second.cert_verifier)
-        return false;
-    if (first.proxy_resolution_service != second.proxy_resolution_service)
-        return false;
-    if (first.ssl_config_service != second.ssl_config_service)
-        return false;
-    if (first.http_auth_handler_factory != second.http_auth_handler_factory)
-        return false;
-    if (first.http_user_agent_settings != second.http_user_agent_settings)
-        return false;
-    if (first.http_server_properties != second.http_server_properties)
-        return false;
-    if (first.host_resolver != second.host_resolver)
-        return false;
-    if (first.cert_transparency_verifier != second.cert_transparency_verifier)
-        return false;
-    if (first.ct_policy_enforcer != second.ct_policy_enforcer)
-        return false;
-    return true;
-}
-
-static net::HttpNetworkSession::Context generateNetworkSessionContext(net::URLRequestContext *urlRequestContext)
-{
-    net::HttpNetworkSession::Context network_session_context;
-    network_session_context.transport_security_state = urlRequestContext->transport_security_state();
-    network_session_context.cert_verifier = urlRequestContext->cert_verifier();
-    network_session_context.proxy_resolution_service = urlRequestContext->proxy_resolution_service();
-    network_session_context.ssl_config_service = urlRequestContext->ssl_config_service();
-    network_session_context.http_auth_handler_factory = urlRequestContext->http_auth_handler_factory();
-    network_session_context.http_user_agent_settings = urlRequestContext->http_user_agent_settings();
-    network_session_context.http_server_properties = urlRequestContext->http_server_properties();
-    network_session_context.host_resolver = urlRequestContext->host_resolver();
-    network_session_context.cert_transparency_verifier = urlRequestContext->cert_transparency_verifier();
-    network_session_context.ct_policy_enforcer = urlRequestContext->ct_policy_enforcer();
-    return network_session_context;
-}
-
-static net::HttpNetworkSession::Params generateNetworkSessionParams(bool ignoreCertificateErrors)
-{
-    net::HttpNetworkSession::Params network_session_params;
-    network_session_params.ignore_certificate_errors = ignoreCertificateErrors;
-    return network_session_params;
-}
-
 ProfileIODataQt::ProfileIODataQt(ProfileQt *profile)
     : m_profile(profile),
 #if QT_CONFIG(ssl)
@@ -188,27 +87,7 @@ ProfileIODataQt::~ProfileIODataQt()
     if (content::BrowserThread::IsThreadInitialized(content::BrowserThread::IO))
         DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
-    if (m_useForGlobalCertificateVerification) {
-#if defined(USE_NSS_CERTS)
-        net::SetURLRequestContextForNSSHttpIO(nullptr);
-#endif
-        if (s_certNetFetcher) {
-            s_certNetFetcher->Shutdown();
-            s_certNetFetcher.reset();
-        }
-    }
-
-    if (m_urlRequestContext) {
-        if (m_urlRequestContext->proxy_resolution_service())
-            m_urlRequestContext->proxy_resolution_service()->OnShutdown();
-        m_restrictedCookieManagerBindings.CloseAllBindings();
-        cancelAllUrlRequests();
-    }
-
     m_resourceContext.reset();
-    if (m_cookieDelegate)
-        m_cookieDelegate->setCookieMonster(0); // this will let CookieMonsterDelegateQt be deleted
-    m_networkDelegate.reset();
     delete m_proxyConfigService.fetchAndStoreAcquire(0);
 }
 
@@ -239,7 +118,7 @@ net::URLRequestContext *ProfileIODataQt::urlRequestContext()
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     if (!m_initialized)
         initializeOnIOThread();
-    return m_urlRequestContext.get();
+    return nullptr;
 }
 
 content::ResourceContext *ProfileIODataQt::resourceContext()
@@ -269,17 +148,11 @@ base::WeakPtr<ProfileIODataQt> ProfileIODataQt::getWeakPtrOnIOThread()
 
 void ProfileIODataQt::initializeOnIOThread()
 {
-    m_networkDelegate.reset(new NetworkDelegateQt(this));
-    m_hostResolver = net::HostResolver::CreateStandaloneResolver(nullptr);
-    m_urlRequestContext.reset(new net::URLRequestContext());
-    m_urlRequestContext->set_network_delegate(m_networkDelegate.get());
-    m_urlRequestContext->set_enable_brotli(true);
-    m_urlRequestContext->set_host_resolver(m_hostResolver.get());
     // this binds factory to io thread
     m_weakPtr = m_weakPtrFactory.GetWeakPtr();
     const std::lock_guard<QRecursiveMutex> lock(m_mutex);
     generateAllStorage();
-    generateJobFactory();
+//    generateJobFactory();
     setGlobalCertificateVerification();
     m_initialized = true;
 }
@@ -301,296 +174,16 @@ void ProfileIODataQt::initializeOnUIThread()
         createProxyConfig();
 }
 
-void ProfileIODataQt::cancelAllUrlRequests()
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_urlRequestContext);
-
-    const std::set<const net::URLRequest*> *url_requests = m_urlRequestContext->url_requests();
-    std::set<const net::URLRequest*>::const_iterator it = url_requests->begin();
-    std::set<const net::URLRequest*>::const_iterator end = url_requests->end();
-    for ( ; it != end; ++it) {
-        net::URLRequest* request = const_cast<net::URLRequest*>(*it);
-        if (request)
-            request->Cancel();
-    }
-}
-
 void ProfileIODataQt::generateAllStorage()
 {
     Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
     const std::lock_guard<QRecursiveMutex> lock(m_mutex);
-    generateStorage();
-    generateCookieStore();
-    generateUserAgent();
-    generateHttpCache();
     m_updateAllStorage = false;
 }
 
-void ProfileIODataQt::generateStorage()
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_urlRequestContext);
-//    Q_ASSERT(!m_mutex.tryLock()); // assert locked
-
-    // We must stop all requests before deleting their backends.
-    if (m_storage) {
-        m_urlRequestContext->proxy_resolution_service()->OnShutdown();
-        m_restrictedCookieManagerBindings.CloseAllBindings();
-        m_cookieDelegate->setCookieMonster(nullptr);
-        m_storage->set_cookie_store(nullptr);
-        cancelAllUrlRequests();
-        // we need to get rid of dangling pointer due to coming storage deletion
-        m_urlRequestContext->set_http_transaction_factory(nullptr);
-        m_httpNetworkSession.reset();
-        m_transportSecurityPersister.reset();
-    }
-
-    m_storage.reset(new net::URLRequestContextStorage(m_urlRequestContext.get()));
-
-    net::ProxyConfigService *proxyConfigService = m_proxyConfigService.fetchAndStoreAcquire(0);
-    Q_ASSERT(proxyConfigService);
-
-    std::unique_ptr<net::CertVerifier> cert_verifier = net::CertVerifier::CreateDefault(s_certNetFetcher);
-    net::CertVerifier::Config config;
-    // Enable revocation checking:
-    config.enable_rev_checking = true;
-    // Mirroring Android WebView (we have no beef with Symantec, and our users might use them):
-    config.disable_symantec_enforcement = true;
-    cert_verifier->SetConfig(config);
-
-    m_storage->set_cert_verifier(std::move(cert_verifier));
-    std::unique_ptr<net::MultiLogCTVerifier> ct_verifier(new net::MultiLogCTVerifier());
-    std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs;
-    for (const auto &ct_log : certificate_transparency::GetKnownLogs()) {
-        scoped_refptr<const net::CTLogVerifier> log_verifier =
-                net::CTLogVerifier::Create(std::string(ct_log.log_key, ct_log.log_key_length),
-                                           ct_log.log_name);
-        if (!log_verifier)
-            continue;
-        ct_logs.push_back(std::move(log_verifier));
-    }
-    ct_verifier->AddLogs(ct_logs);
-    m_storage->set_cert_transparency_verifier(std::move(ct_verifier));
-    m_storage->set_ct_policy_enforcer(base::WrapUnique(new net::DefaultCTPolicyEnforcer()));
-    m_storage->set_ssl_config_service(std::make_unique<net::SSLConfigServiceDefaults>());
-    if (!m_httpAuthPreferences) {
-        m_httpAuthPreferences.reset(new net::HttpAuthPreferences());
-        std::string serverWhitelist = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kAuthServerWhitelist);
-        m_httpAuthPreferences->SetServerWhitelist(serverWhitelist);
-    }
-    m_storage->set_http_auth_handler_factory(net::HttpAuthHandlerFactory::CreateDefault(
-                                                 m_httpAuthPreferences.get()));
-    m_storage->set_transport_security_state(std::make_unique<net::TransportSecurityState>());
-
-    if (!m_dataPath.isEmpty()) {
-        scoped_refptr<base::SequencedTaskRunner> background_task_runner(
-                    base::CreateSequencedTaskRunnerWithTraits(
-        {base::MayBlock(),
-         base::TaskPriority::BEST_EFFORT,
-         base::TaskShutdownBehavior::BLOCK_SHUTDOWN}));
-        m_transportSecurityPersister =
-                std::make_unique<net::TransportSecurityPersister>(
-                    m_urlRequestContext->transport_security_state(),
-                    toFilePath(m_dataPath),
-                    background_task_runner);
-    };
-
-    m_storage->set_http_server_properties(std::unique_ptr<net::HttpServerProperties>(
-                                              new net::HttpServerPropertiesImpl));
-
-    // The System Proxy Resolver has issues on Windows with unconfigured network cards,
-    // which is why we want to use the v8 one
-    if (!m_dhcpPacFileFetcherFactory)
-        m_dhcpPacFileFetcherFactory.reset(new net::DhcpPacFileFetcherFactory);
-
-    proxy_resolver::mojom::ProxyResolverFactoryPtr proxyResolver(std::move(m_proxyResolverFactoryInterface));
-    m_storage->set_proxy_resolution_service(network::CreateProxyResolutionServiceUsingMojoFactory(
-                                                std::move(proxyResolver),
-                                                std::unique_ptr<net::ProxyConfigService>(proxyConfigService),
-                                                net::PacFileFetcherImpl::CreateWithFileUrlSupport(m_urlRequestContext.get()),
-                                                m_dhcpPacFileFetcherFactory->Create(m_urlRequestContext.get()),
-                                                m_urlRequestContext->host_resolver(),
-                                                nullptr /* NetLog */,
-                                                m_urlRequestContext->network_delegate()));
-
-    m_storage->set_ftp_auth_cache(std::make_unique<net::FtpAuthCache>());
-}
-
-
-void ProfileIODataQt::generateCookieStore()
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_urlRequestContext);
-
-    const std::lock_guard<QRecursiveMutex> lock(m_mutex);
-
-    // FIXME: Add code to remove the old channel-id database.
-    // TODO(nharper): Remove the following when no longer needed - see
-    // crbug.com/903642.
-//        base::PostTaskWithTraits(
-//                    FROM_HERE, {base::TaskPriority::BEST_EFFORT, base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
-//                    base::BindOnce(DeleteChannelIDFiles, path.Append(chrome::kChannelIDFilename)));
-
-    std::unique_ptr<net::CookieStore> cookieStore;
-    switch (m_persistentCookiesPolicy) {
-    case ProfileAdapter::NoPersistentCookies:
-        cookieStore = content::CreateCookieStore(
-            content::CookieStoreConfig(
-                base::FilePath(),
-                false,
-                false,
-                nullptr),
-            nullptr);
-        break;
-    case ProfileAdapter::AllowPersistentCookies:
-        cookieStore = content::CreateCookieStore(
-            content::CookieStoreConfig(
-                toFilePath(m_cookiesPath),
-                false,
-                true,
-                nullptr),
-            nullptr);
-        break;
-    case ProfileAdapter::ForcePersistentCookies:
-        cookieStore = content::CreateCookieStore(
-            content::CookieStoreConfig(
-                toFilePath(m_cookiesPath),
-                true,
-                true,
-                nullptr),
-            nullptr);
-        break;
-    }
-
-    net::CookieMonster * const cookieMonster = static_cast<net::CookieMonster*>(cookieStore.get());
-    m_cookieDelegate->setCookieMonster(cookieMonster);
-    m_storage->set_cookie_store(std::move(cookieStore));
-
-    const std::vector<std::string> cookieableSchemes(kCookieableSchemes,
-                                                     kCookieableSchemes + base::size(kCookieableSchemes));
-    cookieMonster->SetCookieableSchemes(cookieableSchemes, base::DoNothing());
-}
-
-void ProfileIODataQt::generateUserAgent()
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_urlRequestContext);
-    Q_ASSERT(m_storage);
-
-    const std::lock_guard<QRecursiveMutex> lock(m_mutex);
-    m_storage->set_http_user_agent_settings(std::unique_ptr<net::HttpUserAgentSettings>(
-        new net::StaticHttpUserAgentSettings(m_httpAcceptLanguage.toStdString(),
-                                             m_httpUserAgent.toStdString())));
-}
-
-void ProfileIODataQt::generateHttpCache()
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_urlRequestContext);
-    Q_ASSERT(m_storage);
-
-    const std::lock_guard<QRecursiveMutex> lock(m_mutex);
-
-    net::HttpCache::DefaultBackend* main_backend = 0;
-    switch (m_httpCacheType) {
-    case ProfileAdapter::MemoryHttpCache:
-        main_backend =
-            new net::HttpCache::DefaultBackend(
-                net::MEMORY_CACHE,
-                net::CACHE_BACKEND_DEFAULT,
-                base::FilePath(),
-                m_httpCacheMaxSize
-            );
-        break;
-    case ProfileAdapter::DiskHttpCache:
-        main_backend =
-            new net::HttpCache::DefaultBackend(
-                net::DISK_CACHE,
-                net::CACHE_BACKEND_DEFAULT,
-                toFilePath(m_httpCachePath),
-                m_httpCacheMaxSize
-            );
-        break;
-    case ProfileAdapter::NoCache:
-        // It's safe to not create BackendFactory.
-        break;
-    }
-
-    net::HttpCache *cache = 0;
-    net::HttpNetworkSession::Context network_session_context =
-            generateNetworkSessionContext(m_urlRequestContext.get());
-    net::HttpNetworkSession::Params network_session_params =
-            generateNetworkSessionParams(m_ignoreCertificateErrors);
-
-    if (!m_httpNetworkSession
-            || !doNetworkSessionParamsMatch(network_session_params, m_httpNetworkSession->params())
-            || !doNetworkSessionContextMatch(network_session_context, m_httpNetworkSession->context())) {
-        m_httpNetworkSession.reset(new net::HttpNetworkSession(network_session_params,
-                                                               network_session_context));
-    }
-
-    cache = new net::HttpCache(m_httpNetworkSession.get(),
-                               std::unique_ptr<net::HttpCache::DefaultBackend>(main_backend), false);
-
-    m_storage->set_http_transaction_factory(std::unique_ptr<net::HttpCache>(cache));
-}
-
-void ProfileIODataQt::generateJobFactory()
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_urlRequestContext);
-    Q_ASSERT(!m_jobFactory);
-
-    const std::lock_guard<QRecursiveMutex> lock(m_mutex);
-    m_updateJobFactory = false;
-
-    std::unique_ptr<net::URLRequestJobFactoryImpl> jobFactory(new net::URLRequestJobFactoryImpl());
-    for (auto &it : m_protocolHandlers)
-        jobFactory->SetProtocolHandler(it.first, base::WrapUnique(it.second.release()));
-    m_protocolHandlers.clear();
-
-    jobFactory->SetProtocolHandler(url::kDataScheme,
-                                   std::unique_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-                                       new net::DataProtocolHandler()));
-    scoped_refptr<base::TaskRunner> taskRunner(base::CreateTaskRunnerWithTraits({base::MayBlock(),
-                                      base::TaskPriority::BEST_EFFORT,
-                                      base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}));
-    jobFactory->SetProtocolHandler(url::kFileScheme,
-                                   std::make_unique<net::FileProtocolHandler>(taskRunner));
-    jobFactory->SetProtocolHandler(url::kFtpScheme,
-            net::FtpProtocolHandler::Create(m_urlRequestContext->host_resolver(), m_urlRequestContext->ftp_auth_cache()));
-
-    m_installedCustomSchemes = m_customUrlSchemes;
-    for (const QByteArray &scheme : qAsConst(m_installedCustomSchemes)) {
-        jobFactory->SetProtocolHandler(scheme.toStdString(),
-                                       std::unique_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-                                           new CustomProtocolHandler(m_profileAdapter)));
-    }
-
-    m_baseJobFactory = jobFactory.get();
-
-    // Set up interceptors in the reverse order.
-    std::unique_ptr<net::URLRequestJobFactory> topJobFactory = std::move(jobFactory);
-    content::URLRequestInterceptorScopedVector::reverse_iterator i;
-    for (i = m_requestInterceptors.rbegin(); i != m_requestInterceptors.rend(); ++i) {
-        topJobFactory.reset(new net::URLRequestInterceptingJobFactory(std::move(topJobFactory),
-                                                                      std::move(*i)));
-    }
-
-    m_requestInterceptors.clear();
-
-    m_jobFactory = std::move(topJobFactory);
-
-    m_urlRequestContext->set_job_factory(m_jobFactory.get());
-}
-
 void ProfileIODataQt::regenerateJobFactory()
 {
     Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_urlRequestContext);
-    Q_ASSERT(m_jobFactory);
-    Q_ASSERT(m_baseJobFactory);
 
     const std::lock_guard<QRecursiveMutex> lock(m_mutex);
     m_updateJobFactory = false;
@@ -598,31 +191,13 @@ void ProfileIODataQt::regenerateJobFactory()
     if (m_customUrlSchemes == m_installedCustomSchemes)
         return;
 
-    for (const QByteArray &scheme : qAsConst(m_installedCustomSchemes)) {
-        m_baseJobFactory->SetProtocolHandler(scheme.toStdString(), nullptr);
-    }
-
     m_installedCustomSchemes = m_customUrlSchemes;
-    for (const QByteArray &scheme : qAsConst(m_installedCustomSchemes)) {
-        m_baseJobFactory->SetProtocolHandler(scheme.toStdString(),
-                                             std::unique_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-                                                 new CustomProtocolHandler(m_profileAdapter)));
-    }
 }
 
 void ProfileIODataQt::setGlobalCertificateVerification()
 {
     Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
     const std::lock_guard<QRecursiveMutex> lock(m_mutex);
-    if (m_useForGlobalCertificateVerification) {
-#if defined(USE_NSS_CERTS)
-        // Set request context used by NSS for OCSP requests.
-        net::SetURLRequestContextForNSSHttpIO(m_urlRequestContext.get());
-#endif
-        if (!s_certNetFetcher)
-            s_certNetFetcher = base::MakeRefCounted<net::CertNetFetcherImpl>();
-        s_certNetFetcher->SetURLRequestContext(m_urlRequestContext.get());
-    }
 }
 
 void ProfileIODataQt::setRequestContextData(content::ProtocolHandlerMap *protocolHandlers,
@@ -835,23 +410,6 @@ std::unique_ptr<net::ClientCertStore> ProfileIODataQt::CreateClientCertStore()
 #endif
 }
 
-void ProfileIODataQt::CreateRestrictedCookieManager(network::mojom::RestrictedCookieManagerRequest request,
-                                                    network::mojom::RestrictedCookieManagerRole role,
-                                                    const url::Origin &origin,
-                                                    bool is_service_worker,
-                                                    int32_t process_id,
-                                                    int32_t routing_id)
-{
-    Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    m_restrictedCookieManagerBindings.AddBinding(
-                std::make_unique<RestrictedCookieManagerQt>(
-                        m_weakPtr,
-                        role, urlRequestContext()->cookie_store(),
-                        &m_cookieSettings, origin,
-                        is_service_worker, process_id, routing_id),
-                std::move(request));
-}
-
 network::mojom::NetworkContextParamsPtr ProfileIODataQt::CreateNetworkContextParams()
 {
     updateStorageSettings();
diff --git a/src/core/profile_io_data_qt.h b/src/core/profile_io_data_qt.h
index 882602012..25e03a4fd 100644
--- a/src/core/profile_io_data_qt.h
+++ b/src/core/profile_io_data_qt.h
@@ -42,15 +42,12 @@
 
 #include "profile_adapter.h"
 #include "content/public/browser/browsing_data_remover.h"
-#include "content/public/common/url_loader_throttle.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "extensions/buildflags/buildflags.h"
-#include "mojo/public/cpp/bindings/strong_binding_set.h"
 #include "net/proxy_config_monitor.h"
 #include "services/network/cookie_settings.h"
 #include "services/network/public/mojom/network_context.mojom.h"
-#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
 #include "services/proxy_resolver/public/mojom/proxy_resolver.mojom.h"
 
 #include <QtCore/QString>
@@ -59,16 +56,7 @@
 
 namespace net {
 class ClientCertStore;
-class DhcpPacFileFetcherFactory;
-class HttpAuthPreferences;
-class HttpNetworkSession;
-class HostResolver;
-class NetworkDelegate;
 class ProxyConfigService;
-class URLRequestContext;
-class URLRequestContextStorage;
-class URLRequestJobFactoryImpl;
-class TransportSecurityPersister;
 }
 
 namespace extensions {
@@ -121,11 +109,6 @@ public:
 
     void cancelAllUrlRequests();
     void generateAllStorage();
-    void generateStorage();
-    void generateCookieStore();
-    void generateHttpCache();
-    void generateUserAgent();
-    void generateJobFactory();
     void regenerateJobFactory();
     bool canSetCookie(const QUrl &firstPartyUrl, const QByteArray &cookieLine, const QUrl &url) const;
     bool canGetCookies(const QUrl &firstPartyUrl, const QUrl &url) const;
@@ -151,13 +134,6 @@ public:
     void updateUsedForGlobalCertificateVerification(); // runs on ui thread
     bool hasPageInterceptors();
 
-    void CreateRestrictedCookieManager(network::mojom::RestrictedCookieManagerRequest request,
-                                       network::mojom::RestrictedCookieManagerRole role,
-                                       const url::Origin &origin,
-                                       bool is_service_worker,
-                                       int32_t process_id,
-                                       int32_t routing_id);
-
     network::mojom::NetworkContextParamsPtr CreateNetworkContextParams();
 
 #if QT_CONFIG(ssl)
@@ -176,28 +152,17 @@ private:
     void removeBrowsingDataRemoverObserver();
 
     ProfileQt *m_profile;
-    std::unique_ptr<net::URLRequestContextStorage> m_storage;
-    std::unique_ptr<net::NetworkDelegate> m_networkDelegate;
     std::unique_ptr<content::ResourceContext> m_resourceContext;
-    std::unique_ptr<net::URLRequestContext> m_urlRequestContext;
-    std::unique_ptr<net::HttpNetworkSession> m_httpNetworkSession;
     scoped_refptr<ProtocolHandlerRegistry::IOThreadDelegate>
             m_protocolHandlerRegistryIOThreadDelegate;
-    std::unique_ptr<net::DhcpPacFileFetcherFactory> m_dhcpPacFileFetcherFactory;
-    std::unique_ptr<net::HttpAuthPreferences> m_httpAuthPreferences;
-    std::unique_ptr<net::URLRequestJobFactory> m_jobFactory;
-    std::unique_ptr<net::TransportSecurityPersister> m_transportSecurityPersister;
-    std::unique_ptr<net::HostResolver> m_hostResolver;
     base::WeakPtr<ProfileIODataQt> m_weakPtr;
     scoped_refptr<CookieMonsterDelegateQt> m_cookieDelegate;
     content::URLRequestInterceptorScopedVector m_requestInterceptors;
     content::ProtocolHandlerMap m_protocolHandlers;
     mojo::InterfacePtrInfo<proxy_resolver::mojom::ProxyResolverFactory> m_proxyResolverFactoryInterface;
-    net::URLRequestJobFactoryImpl *m_baseJobFactory = nullptr;
     QAtomicPointer<net::ProxyConfigService> m_proxyConfigService;
     QPointer<ProfileAdapter> m_profileAdapter; // never dereferenced in IO thread and it is passed by qpointer
     ProfileAdapter::PersistentCookiesPolicy m_persistentCookiesPolicy;
-    mojo::StrongBindingSet<network::mojom::RestrictedCookieManager> m_restrictedCookieManagerBindings;
     std::unique_ptr<ProxyConfigMonitor> m_proxyConfigMonitor;
 
 #if QT_CONFIG(ssl)
diff --git a/src/core/profile_qt.cpp b/src/core/profile_qt.cpp
index be55e7c49..4d4f588fa 100644
--- a/src/core/profile_qt.cpp
+++ b/src/core/profile_qt.cpp
@@ -44,7 +44,6 @@
 #include "command_line_pref_store_qt.h"
 #include "download_manager_delegate_qt.h"
 #include "net/ssl_host_state_delegate_qt.h"
-#include "net/url_request_context_getter_qt.h"
 #include "permission_manager_qt.h"
 #include "platform_notification_service_qt.h"
 #include "qtwebenginecoreglobal_p.h"
@@ -225,19 +224,7 @@ net::URLRequestContextGetter *ProfileQt::CreateRequestContext(
         content::ProtocolHandlerMap *protocol_handlers,
         content::URLRequestInterceptorScopedVector request_interceptors)
 {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-    DCHECK(!m_urlRequestContextGetter.get());
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-    extensions::InfoMap *extension_info_map = GetExtensionSystem()->info_map();
-    (*protocol_handlers)[extensions::kExtensionScheme] =
-            extensions::CreateExtensionProtocolHandler(IsOffTheRecord(), extension_info_map);
-#endif
-
-    m_profileIOData->setRequestContextData(protocol_handlers, std::move(request_interceptors));
-    m_profileIOData->updateStorageSettings();
-    m_profileIOData->updateRequestInterceptor();
-    m_urlRequestContextGetter = new URLRequestContextGetterQt(m_profileIOData.get());
-    return m_urlRequestContextGetter.get();
+    return nullptr;
 }
 
 content::ClientHintsControllerDelegate *ProfileQt::GetClientHintsControllerDelegate()
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 271b87736..078b34d64 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -49,7 +49,6 @@
 #include "favicon_manager.h"
 #include "file_picker_controller.h"
 #include "media_capture_devices_dispatcher.h"
-#include "net/network_delegate_qt.h"
 #include "profile_qt.h"
 #include "qwebengineregisterprotocolhandlerrequest.h"
 #include "register_protocol_handler_request_controller_impl.h"