Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Id1a1f4ca84697ba18e2604090e3154295fe1858b

1 files changed, 13 insertions, 14 deletions

diff --git a/src/core/net/proxying_url_loader_factory_qt.cpp b/src/core/net/proxying_url_loader_factory_qt.cpp
index 235079c26..2b1472e88 100644
--- a/src/core/net/proxying_url_loader_factory_qt.cpp
+++ b/src/core/net/proxying_url_loader_factory_qt.cpp
@@ -271,9 +271,20 @@ void InterceptedRequest::ContinueAfterIntercept()
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
     if (request_info_.changed()) {
-        if (request_info_.d_ptr->shouldBlockRequest)
+        QWebEngineUrlRequestInfoPrivate &info = *request_info_.d_ptr;
+        if (info.shouldBlockRequest)
             return SendErrorAndCompleteImmediately(net::ERR_BLOCKED_BY_CLIENT);
-        if (request_info_.d_ptr->shouldRedirectRequest) {
+
+        for (auto header = info.extraHeaders.constBegin(); header != info.extraHeaders.constEnd(); ++header) {
+            std::string h = header.key().toStdString();
+            if (base::LowerCaseEqualsASCII(h, "referer")) {
+                request_.referrer = GURL(header.value().toStdString());
+            } else {
+                request_.headers.SetHeader(h, header.value().toStdString());
+            }
+        }
+
+        if (info.shouldRedirectRequest) {
             net::URLRequest::FirstPartyURLPolicy first_party_url_policy =
                     request_.update_first_party_url_on_redirect ? net::URLRequest::UPDATE_FIRST_PARTY_URL_ON_REDIRECT
                                                                 : net::URLRequest::NEVER_CHANGE_FIRST_PARTY_URL;
@@ -295,18 +306,6 @@ void InterceptedRequest::ContinueAfterIntercept()
             target_client_->OnReceiveRedirect(redirectInfo, std::move(current_response_));
             return;
         }
-
-        if (!request_info_.d_ptr->extraHeaders.isEmpty()) {
-            auto end = request_info_.d_ptr->extraHeaders.constEnd();
-            for (auto header = request_info_.d_ptr->extraHeaders.constBegin(); header != end; ++header) {
-                std::string h = header.key().toStdString();
-                if (base::LowerCaseEqualsASCII(h, "referer")) {
-                    request_.referrer = GURL(header.value().toStdString());
-                } else {
-                    request_.headers.SetHeader(h, header.value().toStdString());
-                }
-            }
-        }
     }
 
     if (!target_loader_ && target_factory_) {