summaryrefslogtreecommitdiff
path: root/chromium/net/cert_net
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-03 13:42:47 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-15 10:27:51 +0000
commit8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch)
treed29d987c4d7b173cf853279b79a51598f104b403 /chromium/net/cert_net
parent830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff)
downloadqtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/net/cert_net')
-rw-r--r--chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc b/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
index 1341f353a66..8eec0772d92 100644
--- a/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
+++ b/chromium/net/cert_net/cert_net_fetcher_impl_unittest.cc
@@ -52,7 +52,7 @@ class RequestContext : public URLRequestContext {
storage_.set_cert_transparency_verifier(
std::make_unique<MultiLogCTVerifier>());
storage_.set_ct_policy_enforcer(std::make_unique<CTPolicyEnforcer>());
- storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy));
+ storage_.set_proxy_resolution_service(ProxyResolutionService::CreateFixed(no_proxy));
storage_.set_ssl_config_service(new SSLConfigServiceDefaults);
storage_.set_http_server_properties(
std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
@@ -63,7 +63,7 @@ class RequestContext : public URLRequestContext {
session_context.transport_security_state = transport_security_state();
session_context.cert_transparency_verifier = cert_transparency_verifier();
session_context.ct_policy_enforcer = ct_policy_enforcer();
- session_context.proxy_service = proxy_service();
+ session_context.proxy_resolution_service = proxy_resolution_service();
session_context.ssl_config_service = ssl_config_service();
session_context.http_server_properties = http_server_properties();
storage_.set_http_network_session(std::make_unique<HttpNetworkSession>(