Index: chrome/browser/profiles/profile_impl_io_data.cc |
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc |
index 776ba421d3370a1580bbb469c2d0cea8a7419edf..6834969c3e61489b1c124fad369a2af91aeb8dc1 100644 |
--- a/chrome/browser/profiles/profile_impl_io_data.cc |
+++ b/chrome/browser/profiles/profile_impl_io_data.cc |
@@ -30,6 +30,7 @@ |
#include "net/base/server_bound_cert_service.h" |
#include "net/ftp/ftp_network_layer.h" |
#include "net/http/http_cache.h" |
+#include "net/url_request/ftp_protocol_handler.h" |
#include "net/url_request/url_request_job_factory.h" |
#include "webkit/quota/special_storage_policy.h" |
@@ -434,15 +435,39 @@ void ProfileImplIOData::LazyInitializeInternal( |
main_context->set_ftp_transaction_factory(ftp_factory_.get()); |
media_request_context_->set_ftp_transaction_factory(ftp_factory_.get()); |
+ ftp_auth_cache_.reset(new net::FtpAuthCache); |
+ |
main_context->set_chrome_url_data_manager_backend( |
chrome_url_data_manager_backend()); |
- main_context->set_job_factory(job_factory()); |
- media_request_context_->set_job_factory(job_factory()); |
- extensions_context->set_job_factory(job_factory()); |
- |
- job_factory()->AddInterceptor( |
+ main_job_factory_.reset(new net::URLRequestJobFactory); |
+ media_request_job_factory_.reset(new net::URLRequestJobFactory); |
+ extensions_job_factory_.reset(new net::URLRequestJobFactory); |
+ |
+ SetUpJobFactoryDefaults(main_job_factory_.get()); |
+ SetUpJobFactoryDefaults(media_request_job_factory_.get()); |
+ SetUpJobFactoryDefaults(extensions_job_factory_.get()); |
+ |
+ main_job_factory_->SetProtocolHandler(chrome::kFtpScheme, |
+ new net::FtpProtocolHandler( |
+ network_delegate(), ftp_factory_.get(), ftp_auth_cache_.get())); |
+ media_request_job_factory_->SetProtocolHandler(chrome::kFtpScheme, |
+ new net::FtpProtocolHandler( |
+ network_delegate(), ftp_factory_.get(), ftp_auth_cache_.get())); |
+ extensions_job_factory_->SetProtocolHandler(chrome::kFtpScheme, |
+ new net::FtpProtocolHandler( |
+ network_delegate(), ftp_factory_.get(), ftp_auth_cache_.get())); |
+ |
+ main_job_factory_->AddInterceptor( |
+ new chrome_browser_net::ConnectInterceptor(predictor_.get())); |
+ media_request_job_factory_->AddInterceptor( |
new chrome_browser_net::ConnectInterceptor(predictor_.get())); |
+ extensions_job_factory_->AddInterceptor( |
+ new chrome_browser_net::ConnectInterceptor(predictor_.get())); |
+ |
+ main_context->set_job_factory(main_job_factory_.get()); |
+ media_request_context_->set_job_factory(media_request_job_factory_.get()); |
+ extensions_context->set_job_factory(extensions_job_factory_.get()); |
lazy_params_.reset(); |
} |