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 0b9b5fcb1940f70a4e3e1020f69459a3fb7ed169..6de87801f7c8c46f7eb35ace2d2c9e65667145f8 100644 |
--- a/chrome/browser/profiles/profile_impl_io_data.cc |
+++ b/chrome/browser/profiles/profile_impl_io_data.cc |
@@ -402,7 +402,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( |
@@ -412,8 +411,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_context->set_job_factory(main_job_factory_.get()); |
#if defined(ENABLE_EXTENSIONS) |
@@ -455,11 +453,6 @@ void ProfileImplIOData:: |
extensions_cookie_store->GetCookieMonster()->SetCookieableSchemes(schemes, 2); |
extensions_context->set_cookie_store(extensions_cookie_store); |
-#if !defined(DISABLE_FTP_SUPPORT) |
- DCHECK(ftp_factory_); |
- 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. |
@@ -472,8 +465,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()); |
} |
@@ -561,8 +553,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>(); |
} |