4 files changed, 14 insertions, 32 deletions
diff --git a/src/core/api/qwebengineurlrequestjob.h b/src/core/api/qwebengineurlrequestjob.h
index 098d46c93..76e9b2c39 100644
--- a/src/core/api/qwebengineurlrequestjob.h
+++ b/src/core/api/qwebengineurlrequestjob.h
@@ -55,6 +55,7 @@
 #include <QtCore/qurl.h>
 
 namespace QtWebEngineCore {
+class URLRequestCustomJob;
 class URLRequestCustomJobDelegate;
 } // namespace
 
@@ -86,7 +87,7 @@ public:
 
 private:
     QWebEngineUrlRequestJob(QtWebEngineCore::URLRequestCustomJobDelegate *);
-    friend class QWebEngineUrlSchemeHandlerPrivate;
+    friend class QtWebEngineCore::URLRequestCustomJob;
 
     QtWebEngineCore::URLRequestCustomJobDelegate* d_ptr;
 };
diff --git a/src/core/api/qwebengineurlschemehandler.cpp b/src/core/api/qwebengineurlschemehandler.cpp
index e14da6fb5..b2994847b 100644
--- a/src/core/api/qwebengineurlschemehandler.cpp
+++ b/src/core/api/qwebengineurlschemehandler.cpp
@@ -53,23 +53,11 @@ QT_BEGIN_NAMESPACE
 
 */
 
-QWebEngineUrlSchemeHandlerPrivate::QWebEngineUrlSchemeHandlerPrivate(const QByteArray &scheme, QWebEngineUrlSchemeHandler *q)
-    : CustomUrlSchemeHandler(scheme)
-    , q_ptr(q)
+QWebEngineUrlSchemeHandlerPrivate::QWebEngineUrlSchemeHandlerPrivate(const QByteArray &scheme)
+    : m_scheme(scheme)
 {
 }
 
-QWebEngineUrlSchemeHandlerPrivate::~QWebEngineUrlSchemeHandlerPrivate()
-{
-}
-
-bool QWebEngineUrlSchemeHandlerPrivate::handleJob(QtWebEngineCore::URLRequestCustomJobDelegate *job)
-{
-    QWebEngineUrlRequestJob *requestJob = new QWebEngineUrlRequestJob(job);
-    q_ptr->requestStarted(requestJob);
-    return true;
-}
-
 /*!
     Constructs a new URL scheme handler.
 
@@ -78,7 +66,7 @@ bool QWebEngineUrlSchemeHandlerPrivate::handleJob(QtWebEngineCore::URLRequestCus
   */
 QWebEngineUrlSchemeHandler::QWebEngineUrlSchemeHandler(const QByteArray &scheme, QObject *parent)
     : QObject(parent)
-    , d_ptr(new QWebEngineUrlSchemeHandlerPrivate(scheme, this))
+    , d_ptr(new QWebEngineUrlSchemeHandlerPrivate(scheme))
 {
 }
 
diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h
index 1ec32e46c..1b6a66706 100644
--- a/src/core/api/qwebengineurlschemehandler.h
+++ b/src/core/api/qwebengineurlschemehandler.h
@@ -42,6 +42,10 @@
 #include <QtCore/qbytearray.h>
 #include <QtCore/qobject.h>
 
+namespace QtWebEngineCore {
+class URLRequestContextGetterQt;
+}
+
 QT_BEGIN_NAMESPACE
 
 class QWebEngineUrlRequestJob;
@@ -63,8 +67,6 @@ Q_SIGNALS:
 private:
     Q_DISABLE_COPY(QWebEngineUrlSchemeHandler)
     Q_DECLARE_PRIVATE(QWebEngineUrlSchemeHandler)
-    friend class QWebEngineProfile;
-    friend class QQuickWebEngineProfile;
     QWebEngineUrlSchemeHandlerPrivate *d_ptr;
 };
 
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