Support QNetworkProxy::applicationProxy

Implement a ProxyConfigService that keeps track of the state
of Qt's application proxy which, if set, takes precedence
over the system settings.

Change-Id: I7f1eba9015b70cf90f53a41736dd0a6d0ad28489
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp
index 4f893175a..8247e07eb 100644
--- a/src/core/url_request_context_getter_qt.cpp
+++ b/src/core/url_request_context_getter_qt.cpp
@@ -66,6 +66,7 @@
 #include "custom_url_scheme_handler.h"
 #include "content_client_qt.h"
 #include "network_delegate_qt.h"
+#include "proxy_config_service_qt.h"
 #include "qrc_protocol_handler_qt.h"
 #include "type_conversion.h"
 
@@ -111,10 +112,10 @@ void URLRequestContextGetterQt::updateStorageSettings()
         // We must create the proxy config service on the UI loop on Linux because it
         // must synchronously run on the glib message loop. This will be passed to
         // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
-        m_proxyConfigService = net::ProxyService::CreateSystemProxyConfigService(
+        m_proxyConfigService = new ProxyConfigServiceQt(net::ProxyService::CreateSystemProxyConfigService(
             content::BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
             content::BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)
-        );
+        ));
         if (m_storage)
             content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE, base::Bind(&URLRequestContextGetterQt::generateStorage, this));
     }