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

Come Correct with memory management

Browse source
This commit is contained in:
Paul Betts 2015-05-05 22:35:48 -07:00
parent dbe969b5c5
commit a18e5d7d5c
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
brightray/browser/url_request_context_getter.cc
View file

@ -21,7 +21,6 @@
#include "net/dns/mapped_host_resolver.h" #include "net/dns/mapped_host_resolver.h"
#include "net/http/http_auth_handler_factory.h" #include "net/http/http_auth_handler_factory.h"
#include "net/http/http_server_properties_impl.h" #include "net/http/http_server_properties_impl.h"
#include "net/http/url_security_manager.h"
#include "net/proxy/dhcp_proxy_script_fetcher_factory.h" #include "net/proxy/dhcp_proxy_script_fetcher_factory.h"
#include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_config_service.h"
#include "net/proxy/proxy_script_fetcher_impl.h" #include "net/proxy/proxy_script_fetcher_impl.h"
@ -120,6 +119,7 @@ URLRequestContextGetter::URLRequestContextGetter(
base_path_(base_path), base_path_(base_path),
io_loop_(io_loop), io_loop_(io_loop),
file_loop_(file_loop), file_loop_(file_loop),
url_sec_mgr_(net::URLSecurityManager::Create(NULL, NULL)),
protocol_interceptors_(protocol_interceptors.Pass()) { protocol_interceptors_(protocol_interceptors.Pass()) {
// Must first be created on the UI thread. // Must first be created on the UI thread.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@ -189,7 +189,6 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
NULL, NULL,
url_request_context_->network_delegate())); url_request_context_->network_delegate()));
auto url_sec_mgr = net::URLSecurityManager::Create(NULL, NULL);
std::vector<std::string> schemes; std::vector<std::string> schemes;
schemes.push_back(std::string("basic")); schemes.push_back(std::string("basic"));
@ -200,7 +199,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
auto auth_handler_factory = auto auth_handler_factory =
net::HttpAuthHandlerRegistryFactory::Create( net::HttpAuthHandlerRegistryFactory::Create(
schemes, schemes,
url_sec_mgr, url_sec_mgr_.get(),
host_resolver.get(), host_resolver.get(),
std::string(), // gssapi_library_name std::string(), // gssapi_library_name
false, // negotiate_disable_cname_lookup false, // negotiate_disable_cname_lookup

2
brightray/browser/url_request_context_getter.h
View file

@ -9,6 +9,7 @@
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "content/public/browser/content_browser_client.h" #include "content/public/browser/content_browser_client.h"
#include "net/http/http_cache.h" #include "net/http/http_cache.h"
#include "net/http/url_security_manager.h"
#include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_getter.h"
namespace base { namespace base {
@ -68,6 +69,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
scoped_ptr<net::URLRequestContextStorage> storage_; scoped_ptr<net::URLRequestContextStorage> storage_;
scoped_ptr<net::URLRequestContext> url_request_context_; scoped_ptr<net::URLRequestContext> url_request_context_;
scoped_ptr<net::HostMappingRules> host_mapping_rules_; scoped_ptr<net::HostMappingRules> host_mapping_rules_;
scoped_ptr<net::URLSecurityManager> url_sec_mgr_;
content::ProtocolHandlerMap protocol_handlers_; content::ProtocolHandlerMap protocol_handlers_;
content::URLRequestInterceptorScopedVector protocol_interceptors_; content::URLRequestInterceptorScopedVector protocol_interceptors_;