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

simplify URLRequestContextGetter for HttpNetworkSession::Context

Browse source
This commit is contained in:
deepak1556 2017-11-02 19:35:30 +05:30 committed by Cheng Zhao
parent e0860ea7a0
commit e60557e2e6
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
brightray/browser/url_request_context_getter.cc
View file

@ -298,10 +298,6 @@ 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::Context network_session_context;
net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
url_request_context_.get(), &network_session_context);
net::HttpNetworkSession::Params network_session_params; net::HttpNetworkSession::Params network_session_params;
network_session_params.ignore_certificate_errors = false; network_session_params.ignore_certificate_errors = false;
@ -323,11 +319,13 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
// 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_context.host_resolver =
url_request_context_->host_resolver();
net::HttpNetworkSession::Context network_session_context;
net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
url_request_context_.get(), &network_session_context);
http_network_session_.reset(new net::HttpNetworkSession( http_network_session_.reset(new net::HttpNetworkSession(
network_session_params, network_session_context)); 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);