1 files changed, 10 insertions, 17 deletions

diff --git a/src/core/net/proxy_config_service_qt.cpp b/src/core/net/proxy_config_service_qt.cpp
index 7fca18eb6..13b969281 100644
--- a/src/core/net/proxy_config_service_qt.cpp
+++ b/src/core/net/proxy_config_service_qt.cpp
@@ -91,14 +91,12 @@ void ProxyConfigServiceQt::RemoveObserver(net::ProxyConfigService::Observer *obs
     m_observers.RemoveObserver(observer);
 }
 
-net::ProxyConfigService::ConfigAvailability ProxyConfigServiceQt::GetLatestProxyConfig(net::ProxyConfig *config)
+net::ProxyConfigService::ConfigAvailability ProxyConfigServiceQt::GetLatestProxyConfig(net::ProxyConfigWithAnnotation *config)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
     m_usesSystemConfiguration = QNetworkProxyFactory::usesSystemConfiguration();
-#endif
     if (m_usesSystemConfiguration) {
         // Use Chromium's base service to retrieve system settings
-        net::ProxyConfig systemConfig;
+        net::ProxyConfigWithAnnotation systemConfig;
         ConfigAvailability systemAvailability = net::ProxyConfigService::CONFIG_UNSET;
         if (m_baseService.get())
             systemAvailability = m_baseService->GetLatestProxyConfig(&systemConfig);
@@ -112,7 +110,7 @@ net::ProxyConfigService::ConfigAvailability ProxyConfigServiceQt::GetLatestProxy
     const QNetworkProxy &qtProxy = QNetworkProxy::applicationProxy();
     if (qtProxy == m_qtApplicationProxy && !m_qtProxyConfig.proxy_rules().empty()) {
         // no changes
-        *config = m_qtProxyConfig;
+        *config = net::ProxyConfigWithAnnotation(m_qtProxyConfig, config->traffic_annotation());
         return CONFIG_VALID;
     }
 
@@ -124,24 +122,24 @@ net::ProxyConfigService::ConfigAvailability ProxyConfigServiceQt::GetLatestProxy
     switch (qtProxy.type()) {
     case QNetworkProxy::HttpProxy:
     case QNetworkProxy::Socks5Proxy:
-        qtRules.type = net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY;
+        qtRules.type = net::ProxyConfig::ProxyRules::Type::PROXY_LIST;
         qtRules.single_proxies.SetSingleProxyServer(server);
         break;
     case QNetworkProxy::HttpCachingProxy:
-        qtRules.type = net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
+        qtRules.type = net::ProxyConfig::ProxyRules::Type::PROXY_LIST_PER_SCHEME;
         qtRules.proxies_for_http.SetSingleProxyServer(server);
         break;
     case QNetworkProxy::FtpCachingProxy:
-        qtRules.type = net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
+        qtRules.type = net::ProxyConfig::ProxyRules::Type::PROXY_LIST_PER_SCHEME;
         qtRules.proxies_for_ftp.SetSingleProxyServer(server);
         break;
     default:
-        qtRules.type = net::ProxyConfig::ProxyRules::TYPE_NO_RULES;
+        qtRules.type = net::ProxyConfig::ProxyRules::Type::EMPTY;
     }
 
     qtRules.bypass_rules.AddRuleToBypassLocal(); // don't use proxy for connections to localhost
     m_qtProxyConfig.proxy_rules() = qtRules;
-    *config = m_qtProxyConfig;
+    *config = net::ProxyConfigWithAnnotation(m_qtProxyConfig, config->traffic_annotation());
     return CONFIG_VALID;
 }
 
@@ -149,7 +147,6 @@ void ProxyConfigServiceQt::OnLazyPoll()
 {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
     // We need to update if
     // - setUseSystemConfiguration() was called in between
     // - user changed application proxy
@@ -160,14 +157,10 @@ void ProxyConfigServiceQt::OnLazyPoll()
         if (m_baseService.get())
             m_baseService->OnLazyPoll();
     }
-#else
-    if (m_qtApplicationProxy != QNetworkProxy::applicationProxy())
-        Update();
-#endif
 }
 
 // Called when the base service changed
-void ProxyConfigServiceQt::OnProxyConfigChanged(const net::ProxyConfig &config, ConfigAvailability availability)
+void ProxyConfigServiceQt::OnProxyConfigChanged(const net::ProxyConfigWithAnnotation &config, ConfigAvailability availability)
 {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     Q_UNUSED(config);
@@ -181,7 +174,7 @@ void ProxyConfigServiceQt::OnProxyConfigChanged(const net::ProxyConfig &config,
 // Update our observers
 void ProxyConfigServiceQt::Update()
 {
-    net::ProxyConfig actual_config;
+    net::ProxyConfigWithAnnotation actual_config;
     ConfigAvailability availability = GetLatestProxyConfig(&actual_config);
     if (availability == CONFIG_PENDING)
         return;