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

Fix a crash introduced by #41
electron · Dec 15, 2013 · cf51b16 · cf51b16
2 parents c85578b + c722235
commit cf51b16
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/browser/url_request_context_getter.cc b/browser/url_request_context_getter.cc
@@ -86,6 +86,16 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
     scoped_ptr<net::HostResolver> host_resolver(
         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_ssl_config_service(new net::SSLConfigServiceDefaults);
     storage_->set_http_auth_handler_factory(
@@ -126,16 +136,6 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
     network_session_params.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(
         network_session_params, main_backend);
     storage_->set_http_transaction_factory(main_cache);