Revert "Add HTTP request headers to custom URL schemes"

This reverts commit a5bdc6236ad52586579a9a3da6a059835ed60761
and 04355f4d6f311adebfc354b094a5f79c6327e86f.

CI still crashes on tst_QWebEngineProfile::urlSchemeHandler tests,
issue is not reproducible locally and it will take time to investigate.

Task-number: QTBUG-69844
Change-Id: I7ddb6a32383400d553fe692c24effb6dfb7b6102
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 8 insertions, 36 deletions

diff --git a/src/core/net/url_request_custom_job.cpp b/src/core/net/url_request_custom_job.cpp
index f4dfc6ae9..c69fb1808 100644
--- a/src/core/net/url_request_custom_job.cpp
+++ b/src/core/net/url_request_custom_job.cpp
@@ -39,13 +39,10 @@
 
 #include "url_request_custom_job.h"
 #include "url_request_custom_job_proxy.h"
-#include "../type_conversion.h"
-
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
 
 #include <QIODevice>
-#include <QMap>
 
 using namespace net;
 
@@ -79,22 +76,9 @@ URLRequestCustomJob::~URLRequestCustomJob()
 void URLRequestCustomJob::Start()
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-    HttpRequestHeaders requestHeaders = request()->extra_request_headers();
-    QMap<QByteArray, QByteArray> headers;
-    net::HttpRequestHeaders::Iterator it(requestHeaders);
-    while (it.GetNext())
-        headers.insert(toQByteArray(it.name()), toQByteArray(it.value()));
-    if (!request()->referrer().empty())
-        headers.insert(QByteArray("Referer"), toQByteArray(request()->referrer()));
-
-    // TODO: handle UploadDataStream, for instance using a QIODevice wrapper.
-
     content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
-                                     base::Bind(&URLRequestCustomJobProxy::initialize, m_proxy,
-                                                request()->url(),
-                                                request()->method(),
-                                                request()->initiator(),
-                                                headers));
+                                     base::Bind(&URLRequestCustomJobProxy::initialize,
+                                     m_proxy, request()->url(), request()->method(), request()->initiator()));
 }
 
 void URLRequestCustomJob::Kill()
diff --git a/src/core/net/url_request_custom_job_delegate.cpp b/src/core/net/url_request_custom_job_delegate.cpp
index 4ed6a2484..338bd7137 100644
--- a/src/core/net/url_request_custom_job_delegate.cpp
+++ b/src/core/net/url_request_custom_job_delegate.cpp
@@ -51,13 +51,11 @@ namespace QtWebEngineCore {
 URLRequestCustomJobDelegate::URLRequestCustomJobDelegate(URLRequestCustomJobProxy *proxy,
                                                          const QUrl &url,
                                                          const QByteArray &method,
-                                                         const QUrl &initiatorOrigin,
-                                                         const QMap<QByteArray, QByteArray> &headers)
+                                                         const QUrl &initiatorOrigin)
     : m_proxy(proxy),
       m_request(url),
       m_method(method),
-      m_initiatorOrigin(initiatorOrigin),
-      m_requestHeaders(headers)
+      m_initiatorOrigin(initiatorOrigin)
 {
 }
 
@@ -80,11 +78,6 @@ QUrl URLRequestCustomJobDelegate::initiator() const
     return m_initiatorOrigin;
 }
 
-const QMap<QByteArray, QByteArray> &URLRequestCustomJobDelegate::requestHeaders() const
-{
-    return m_requestHeaders;
-}
-
 void URLRequestCustomJobDelegate::reply(const QByteArray &contentType, QIODevice *device)
 {
     if (device)
diff --git a/src/core/net/url_request_custom_job_delegate.h b/src/core/net/url_request_custom_job_delegate.h
index 9de0224f9..caabfcf99 100644
--- a/src/core/net/url_request_custom_job_delegate.h
+++ b/src/core/net/url_request_custom_job_delegate.h
@@ -54,7 +54,6 @@
 #include "base/memory/ref_counted.h"
 #include "qtwebenginecoreglobal_p.h"
 
-#include <QMap>
 #include <QObject>
 #include <QUrl>
 
@@ -81,7 +80,6 @@ public:
     QUrl url() const;
     QByteArray method() const;
     QUrl initiator() const;
-    const QMap<QByteArray, QByteArray> &requestHeaders() const;
 
     void reply(const QByteArray &contentType, QIODevice *device);
     void redirect(const QUrl& url);
@@ -95,15 +93,13 @@ private:
     URLRequestCustomJobDelegate(URLRequestCustomJobProxy *proxy,
                                 const QUrl &url,
                                 const QByteArray &method,
-                                const QUrl &initiatorOrigin,
-                                const QMap<QByteArray, QByteArray> &requestHeaders);
+                                const QUrl &initiatorOrigin);
 
     friend class URLRequestCustomJobProxy;
     scoped_refptr<URLRequestCustomJobProxy> m_proxy;
     QUrl m_request;
     QByteArray m_method;
     QUrl m_initiatorOrigin;
-    const QMap<QByteArray, QByteArray> m_requestHeaders;
 };
 
 } // namespace
diff --git a/src/core/net/url_request_custom_job_proxy.cpp b/src/core/net/url_request_custom_job_proxy.cpp
index 10ca4d0b1..5280318ad 100644
--- a/src/core/net/url_request_custom_job_proxy.cpp
+++ b/src/core/net/url_request_custom_job_proxy.cpp
@@ -152,7 +152,7 @@ void URLRequestCustomJobProxy::readyRead()
         m_job->notifyReadyRead();
 }
 
-void URLRequestCustomJobProxy::initialize(GURL url, std::string method, base::Optional<url::Origin> initiator, QMap<QByteArray, QByteArray> headers)
+void URLRequestCustomJobProxy::initialize(GURL url, std::string method, base::Optional<url::Origin> initiator)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     Q_ASSERT(!m_delegate);
@@ -169,8 +169,7 @@ void URLRequestCustomJobProxy::initialize(GURL url, std::string method, base::Op
     if (schemeHandler) {
         m_delegate = new URLRequestCustomJobDelegate(this, toQt(url),
                                                      QByteArray::fromStdString(method),
-                                                     initiatorOrigin,
-                                                     headers);
+                                                     initiatorOrigin);
         QWebEngineUrlRequestJob *requestJob = new QWebEngineUrlRequestJob(m_delegate);
         schemeHandler->requestStarted(requestJob);
     }
diff --git a/src/core/net/url_request_custom_job_proxy.h b/src/core/net/url_request_custom_job_proxy.h
index 1f4494945..3986fe119 100644
--- a/src/core/net/url_request_custom_job_proxy.h
+++ b/src/core/net/url_request_custom_job_proxy.h
@@ -72,7 +72,7 @@ public:
     void abort();
     void fail(int error);
     void release();
-    void initialize(GURL url, std::string method, base::Optional<url::Origin> initiatorOrigin, QMap<QByteArray, QByteArray> headers);
+    void initialize(GURL url, std::string method, base::Optional<url::Origin> initiatorOrigin);
     void readyRead();
 
     // IO thread owned: