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

Merge pull request #45 from brightray/fix-proxy-crash

Browse source 
Fix a crash introduced by #41
This commit is contained in:
Adam Roben 2013-12-15 05:54:23 -08:00
commit 8aba54e71a
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
brightray/browser/url_request_context_getter.cc
View file

@ -86,6 +86,16 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
scoped_ptr<net::HostResolver> host_resolver( scoped_ptr<net::HostResolver> host_resolver(
net::HostResolver::CreateDefaultResolver(NULL)); net::HostResolver::CreateDefaultResolver(NULL));
net::DhcpProxyScriptFetcherFactory dhcp_factory;
storage_->set_proxy_service(
net::CreateProxyServiceUsingV8ProxyResolver(
proxy_config_service_.release(),
new net::ProxyScriptFetcherImpl(url_request_context_.get()),
dhcp_factory.Create(url_request_context_.get()),
host_resolver.get(),
NULL,
url_request_context_->network_delegate()));
storage_->set_cert_verifier(net::CertVerifier::CreateDefault()); storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
storage_->set_http_auth_handler_factory( storage_->set_http_auth_handler_factory(
@ -126,16 +136,6 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
network_session_params.host_resolver = network_session_params.host_resolver =
url_request_context_->host_resolver(); url_request_context_->host_resolver();
net::DhcpProxyScriptFetcherFactory dhcp_factory;
storage_->set_proxy_service(
net::CreateProxyServiceUsingV8ProxyResolver(
proxy_config_service_.release(),
new net::ProxyScriptFetcherImpl(url_request_context_.get()),
dhcp_factory.Create(url_request_context_.get()),
url_request_context_->host_resolver(),
NULL,
url_request_context_->network_delegate()));
net::HttpCache* main_cache = new net::HttpCache( net::HttpCache* main_cache = new net::HttpCache(
network_session_params, main_backend); network_session_params, main_backend);
storage_->set_http_transaction_factory(main_cache); storage_->set_http_transaction_factory(main_cache);