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 952aeaa3bdea202faec50bbb103ce32c02765ed6..d9007d4fb8f7d832e4e770e50801c0beb71f749f 100644 |
--- a/chrome/browser/profiles/profile_impl_io_data.cc |
+++ b/chrome/browser/profiles/profile_impl_io_data.cc |
@@ -415,7 +415,6 @@ void ProfileImplIOData::LazyInitializeInternal( |
#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( |
@@ -424,8 +423,7 @@ void ProfileImplIOData::LazyInitializeInternal( |
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) |
@@ -466,11 +464,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. |
@@ -483,8 +476,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()); |
} |
@@ -567,8 +559,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>(); |
} |