From 6e2bb728b9644136b3a884cdcc6c08bdf8d80b1e Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Sun, 22 Jul 2018 02:12:32 +1000 Subject: [PATCH] Replace ProxyConfigSource with ProxyConfigWithAnnotation. https://chromium-review.googlesource.com/c/chromium/src/+/934126 --- atom/browser/api/atom_api_session.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index b84267b483..3113129720 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -47,7 +47,9 @@ #include "net/http/http_auth_handler_factory.h" #include "net/http/http_auth_preferences.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" +#include "net/proxy_resolution/proxy_config_with_annotation.h" #include "net/proxy_resolution/proxy_resolution_service.h" +#include "net/traffic_annotation/network_traffic_annotation.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" @@ -349,7 +351,8 @@ void SetProxyInIO(scoped_refptr getter, auto* proxy_service = getter->GetURLRequestContext()->proxy_resolution_service(); proxy_service->ResetConfigService( - base::WrapUnique(new net::ProxyConfigServiceFixed(config))); + base::WrapUnique(new net::ProxyConfigServiceFixed( + net::ProxyConfigWithAnnotation(config, NO_TRAFFIC_ANNOTATION_YET)))); // Refetches and applies the new pac script if provided. proxy_service->ForceReloadProxyConfig(); RunCallbackInUI(callback);