From 676a389ecdae5c004a5da8b142ae05194da25cf9 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Wed, 7 Sep 2016 17:54:21 +0900 Subject: [PATCH] Add new network parameters needed by chrome53 --- brightray/browser/url_request_context_getter.cc | 8 ++++++++ brightray/browser/url_request_context_getter.h | 2 ++ brightray/vendor/libchromiumcontent | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 6caf52065c73..601006e5c4ed 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -22,6 +22,8 @@ #include "content/public/common/content_switches.h" #include "net/base/host_mapping_rules.h" #include "net/cert/cert_verifier.h" +#include "net/cert/ct_policy_enforcer.h" +#include "net/cert/multi_log_ct_verifier.h" #include "net/cookies/cookie_monster.h" #include "net/dns/mapped_host_resolver.h" #include "net/http/http_auth_filter.h" @@ -274,6 +276,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { new net::HttpServerPropertiesImpl); storage_->set_http_server_properties(std::move(server_properties)); + cert_transparency_verifier_.reset(new net::MultiLogCTVerifier()); + ct_policy_enforcer_.reset(new net::CTPolicyEnforcer()); + net::HttpNetworkSession::Params network_session_params; network_session_params.cert_verifier = url_request_context_->cert_verifier(); network_session_params.proxy_service = url_request_context_->proxy_service(); @@ -287,6 +292,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { network_session_params.http_auth_handler_factory = url_request_context_->http_auth_handler_factory(); network_session_params.net_log = url_request_context_->net_log(); + network_session_params.cert_transparency_verifier = + cert_transparency_verifier_.get(); + network_session_params.ct_policy_enforcer = ct_policy_enforcer_.get(); // --disable-http2 if (command_line.HasSwitch(switches::kDisableHttp2)) { diff --git a/brightray/browser/url_request_context_getter.h b/brightray/browser/url_request_context_getter.h index ed2814c738bd..31427d0ccdb8 100644 --- a/brightray/browser/url_request_context_getter.h +++ b/brightray/browser/url_request_context_getter.h @@ -88,6 +88,8 @@ class URLRequestContextGetter : public net::URLRequestContextGetter { std::unique_ptr host_mapping_rules_; std::unique_ptr http_auth_preferences_; std::unique_ptr http_network_session_; + std::unique_ptr cert_transparency_verifier_; + std::unique_ptr ct_policy_enforcer_; content::ProtocolHandlerMap protocol_handlers_; content::URLRequestInterceptorScopedVector protocol_interceptors_; diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 60ec84b4b3ee..346dfe40a965 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 60ec84b4b3ee4862aa8c93c0e0e04871ee3ac177 +Subproject commit 346dfe40a9658cc40924d29a1deb1d9669509076