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>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-01-23 15:28:33 +0100
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2020-02-04 20:20:49 +0100
commit: b2c6dfce78777a5ceb1ea9c14e890b884913c6bf (patch)
tree: d35510793e79bd6dac21a0c4661b57535e93c384 /src/core/net
parent: 4455081eabc8610112d1cce56a6f6fc64c0be236 (diff)
15 files changed, 21 insertions, 1818 deletions
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
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-01-23 15:28:33 +0100
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2020-02-04 20:20:49 +0100
commit	b2c6dfce78777a5ceb1ea9c14e890b884913c6bf (patch)
tree	d35510793e79bd6dac21a0c4661b57535e93c384 /src/core/net
parent	4455081eabc8610112d1cce56a6f6fc64c0be236 (diff)