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

Fix assertions in Debug builds about using NetworkDelegate on the wrong thread

Browse source 
We have to create it on the IO thread.
This commit is contained in:
Adam Roben 2013-08-23 08:19:37 -04:00
parent 37679214d1
commit dcaaeacfe3
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
brightray/browser/url_request_context_getter.cc
View file

@ -40,12 +40,12 @@ URLRequestContextGetter::URLRequestContextGetter(
const base::FilePath& base_path,
base::MessageLoop* io_loop,
base::MessageLoop* file_loop,
scoped_ptr<NetworkDelegate> network_delegate,
base::Callback<scoped_ptr<NetworkDelegate>(void)> network_delegate_factory,
content::ProtocolHandlerMap* protocol_handlers)
: base_path_(base_path),
io_loop_(io_loop),
file_loop_(file_loop),
network_delegate_(network_delegate.Pass()) {
network_delegate_factory_(network_delegate_factory) {
// Must first be created on the UI thread.
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@ -67,6 +67,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
if (!url_request_context_.get()) {
url_request_context_.reset(new net::URLRequestContext());
network_delegate_ = network_delegate_factory_.Run().Pass();
url_request_context_->set_network_delegate(network_delegate_.get());
storage_.reset(
new net::URLRequestContextStorage(url_request_context_.get()));