| 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 ac66d6a988d100439d108dc1a042b5cb83aeb531..dc56c9b1e1615bbc0a5bd129eb6db9a9b73c33b1 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.cc
|
| @@ -437,7 +437,6 @@ void ProfileImplIOData::InitializeInternal(
|
| #if !defined(DISABLE_FTP_SUPPORT)
|
| ftp_factory_.reset(
|
| new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
|
| - main_context->set_ftp_transaction_factory(ftp_factory_.get());
|
| #endif // !defined(DISABLE_FTP_SUPPORT)
|
|
|
| scoped_ptr<net::URLRequestJobFactoryImpl> main_job_factory(
|
| @@ -459,8 +458,7 @@ void ProfileImplIOData::InitializeInternal(
|
| main_job_factory.Pass(),
|
| profile_params->protocol_handler_interceptor.Pass(),
|
| network_delegate(),
|
| - main_context->ftp_transaction_factory(),
|
| - main_context->ftp_auth_cache());
|
| + ftp_factory_.get());
|
| main_job_factory_.reset(new net::ProtocolInterceptJobFactory(
|
| main_job_factory_.Pass(), developer_protocol_handler.Pass()));
|
| main_context->set_job_factory(main_job_factory_.get());
|
| @@ -503,11 +501,6 @@ void ProfileImplIOData::
|
| extensions_cookie_store->SetCookieableSchemes(schemes, 2);
|
| extensions_context->set_cookie_store(extensions_cookie_store);
|
|
|
| -#if !defined(DISABLE_FTP_SUPPORT)
|
| - DCHECK(ftp_factory_.get());
|
| - extensions_context->set_ftp_transaction_factory(ftp_factory_.get());
|
| -#endif // !defined(DISABLE_FTP_SUPPORT)
|
| -
|
| scoped_ptr<net::URLRequestJobFactoryImpl> extensions_job_factory(
|
| new net::URLRequestJobFactoryImpl());
|
| // TODO(shalev): The extensions_job_factory has a NULL NetworkDelegate.
|
| @@ -520,8 +513,7 @@ void ProfileImplIOData::
|
| extensions_job_factory.Pass(),
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>(NULL),
|
| NULL,
|
| - extensions_context->ftp_transaction_factory(),
|
| - extensions_context->ftp_auth_cache());
|
| + ftp_factory_.get());
|
| extensions_context->set_job_factory(extensions_job_factory_.get());
|
| }
|
|
|
| @@ -628,8 +620,7 @@ ProfileImplIOData::InitializeAppRequestContext(
|
| top_job_factory = SetUpJobFactoryDefaults(
|
| job_factory.Pass(), protocol_handler_interceptor.Pass(),
|
| network_delegate(),
|
| - context->ftp_transaction_factory(),
|
| - context->ftp_auth_cache());
|
| + ftp_factory_.get());
|
| } else {
|
| top_job_factory = job_factory.PassAs<net::URLRequestJobFactory>();
|
| }
|
|
|