Merge remote-tracking branch 'origin/5.6' into devwip/47-based

Change-Id: I0569b04ced3456a1d5d91e02e117963115fcf1b2

1 files changed, 3 insertions, 3 deletions

diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp
index c9ebf7f3b..771a662b9 100644
--- a/src/core/url_request_context_getter_qt.cpp
+++ b/src/core/url_request_context_getter_qt.cpp
@@ -66,9 +66,9 @@
 #include "net/url_request/ftp_protocol_handler.h"
 #include "net/ftp/ftp_network_layer.h"
 
+#include "api/qwebengineurlschemehandler.h"
 #include "browser_context_adapter.h"
 #include "custom_protocol_handler.h"
-#include "custom_url_scheme_handler.h"
 #include "cookie_monster_delegate_qt.h"
 #include "content_client_qt.h"
 #include "network_delegate_qt.h"
@@ -350,8 +350,8 @@ void URLRequestContextGetterQt::generateJobFactory()
     m_jobFactory->SetProtocolHandler(url::kFtpScheme,
         new net::FtpProtocolHandler(new net::FtpNetworkLayer(m_urlRequestContext->host_resolver())));
 
-    Q_FOREACH (CustomUrlSchemeHandler* handler, m_browserContext->customUrlSchemeHandlers()) {
-        m_jobFactory->SetProtocolHandler(handler->scheme().toStdString(), handler->createProtocolHandler());
+    Q_FOREACH (QWebEngineUrlSchemeHandler *handler, m_browserContext->customUrlSchemeHandlers()) {
+        m_jobFactory->SetProtocolHandler(handler->scheme().toStdString(), new CustomProtocolHandler(handler));
     }
 
     m_urlRequestContext->set_job_factory(m_jobFactory.get());