mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix brightray::URLRequestContextGetter::GetURLRequestContext()

Browse source 
Split HttpNetworkSession::Params into two structs.
https://codereview.chromium.org/2907463002

Make HttpNetworkSession::host_mapping_rules no longer a pointer.
https://codereview.chromium.org/2906463002
This commit is contained in:
Aleksei Kuzmin 2017-08-25 12:51:13 +03:00 committed by Cheng Zhao
parent 491249108e
commit c6333728d9
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
brightray/browser/url_request_context_getter.cc
View file

@ -298,9 +298,11 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
storage_->set_cert_transparency_verifier(std::move(ct_verifier)); storage_->set_cert_transparency_verifier(std::move(ct_verifier));
storage_->set_ct_policy_enforcer(base::MakeUnique<net::CTPolicyEnforcer>()); storage_->set_ct_policy_enforcer(base::MakeUnique<net::CTPolicyEnforcer>());
net::HttpNetworkSession::Params network_session_params; net::HttpNetworkSession::Context network_session_context;
net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
url_request_context_.get(), &network_session_params); url_request_context_.get(), &network_session_context);
net::HttpNetworkSession::Params network_session_params;
network_session_params.ignore_certificate_errors = false; network_session_params.ignore_certificate_errors = false;
// --disable-http2 // --disable-http2
@ -316,16 +318,16 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
host_mapping_rules_.reset(new net::HostMappingRules); host_mapping_rules_.reset(new net::HostMappingRules);
host_mapping_rules_->SetRulesFromString( host_mapping_rules_->SetRulesFromString(
command_line.GetSwitchValueASCII(switches::kHostRules)); command_line.GetSwitchValueASCII(switches::kHostRules));
network_session_params.host_mapping_rules = host_mapping_rules_.get(); network_session_params.host_mapping_rules = *host_mapping_rules_.get();
} }
// Give |storage_| ownership at the end in case it's |mapped_host_resolver|. // Give |storage_| ownership at the end in case it's |mapped_host_resolver|.
storage_->set_host_resolver(std::move(host_resolver)); storage_->set_host_resolver(std::move(host_resolver));
network_session_params.host_resolver = network_session_context.host_resolver =
url_request_context_->host_resolver(); url_request_context_->host_resolver();
http_network_session_.reset( http_network_session_.reset(new net::HttpNetworkSession(
new net::HttpNetworkSession(network_session_params)); network_session_params, network_session_context));
std::unique_ptr<net::HttpCache::BackendFactory> backend; std::unique_ptr<net::HttpCache::BackendFactory> backend;
if (in_memory_) { if (in_memory_) {
backend = net::HttpCache::DefaultBackend::InMemory(0); backend = net::HttpCache::DefaultBackend::InMemory(0);