Skip to content

Commit

Permalink
ProxyConfigServiceFixed constructor now takes a ProxyConfigWithAnnota…
Browse files Browse the repository at this point in the history
…tion instead of ProxyConfigSource

refs: https://chromium-review.googlesource.com/c/chromium/src/+/934126
  • Loading branch information
MarshallOfSound committed Jul 21, 2018
1 parent cd1ff5e commit 77f9b07
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion atom/browser/api/atom_api_session.cc
Expand Up @@ -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"
Expand Down Expand Up @@ -349,7 +351,8 @@ void SetProxyInIO(scoped_refptr<net::URLRequestContextGetter> getter,
auto* proxy_service =
getter->GetURLRequestContext()->proxy_resolution_service();
proxy_service->ResetConfigService(
base::WrapUnique(new net::ProxyConfigServiceFixed(config)));
base::WrapUnique(new net::ProxyConfigServiceFixed(
new net::ProxyConfigWithAnnotation(config, NO_TRAFFIC_ANNOTATION_YET)));
// Refetches and applies the new pac script if provided.
proxy_service->ForceReloadProxyConfig();
RunCallbackInUI(callback);
Expand Down

0 comments on commit 77f9b07

Please sign in to comment.