Remove unnecessay delegation over CustomUrlSchemeHandler

With QWebEngineSchemeHandler in QtWebEngineCore, we do not need the
indirection and delegation CustomUrlSchemeHandler provided. This
means the class can be removed and we can also store the handlers
directly in BrowserContextAdapter and save a copy of the installed
handlers in the QWebEngineProfile.

Change-Id: Iabb5cc9d364c2f2a879bc77bfb2ff14b3c2ff640
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

1 files changed, 5 insertions, 14 deletions

diff --git a/src/core/api/qwebengineurlschemehandler_p.h b/src/core/api/qwebengineurlschemehandler_p.h
index dc4b272b3..d63666326 100644
--- a/src/core/api/qwebengineurlschemehandler_p.h
+++ b/src/core/api/qwebengineurlschemehandler_p.h
@@ -48,27 +48,18 @@
 // We mean it.
 //
 
-#include "qwebengineurlschemehandler.h"
-
-#include "custom_url_scheme_handler.h"
+#include <QtCore/qbytearray.h>
 
 QT_BEGIN_NAMESPACE
 
-class QWebEngineProfile;
-class QWebEngineUrlRequestJob;
-class QWebEngineUrlSchemeHandler;
-
-class QWEBENGINE_EXPORT QWebEngineUrlSchemeHandlerPrivate : public QtWebEngineCore::CustomUrlSchemeHandler {
+class QWEBENGINE_EXPORT QWebEngineUrlSchemeHandlerPrivate {
 public:
-    Q_DECLARE_PUBLIC(QWebEngineUrlSchemeHandler)
-
-    QWebEngineUrlSchemeHandlerPrivate(const QByteArray &, QWebEngineUrlSchemeHandler *);
-    virtual ~QWebEngineUrlSchemeHandlerPrivate();
+    QWebEngineUrlSchemeHandlerPrivate(const QByteArray &);
 
-    virtual bool handleJob(QtWebEngineCore::URLRequestCustomJobDelegate*) Q_DECL_OVERRIDE;
+    const QByteArray &scheme() const { return m_scheme; }
 
 private:
-    QWebEngineUrlSchemeHandler *q_ptr;
+    QByteArray m_scheme;
 };
 
 QT_END_NAMESPACE