Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7635)

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 2428143002: Clean up FtpTransactionFacory ownership. (Closed)
Patch Set: Oops Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 81c06c90a887f5f6e6eaaa83daaf3a14076a428d..56a07d9091d3d81515f47a89d5cbf571247c0dc1 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -1175,7 +1175,7 @@ ProfileIOData::SetUpJobFactoryDefaults(
std::unique_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
protocol_handler_interceptor,
net::NetworkDelegate* network_delegate,
- net::FtpTransactionFactory* ftp_transaction_factory) const {
+ net::HostResolver* host_resolver) const {
// NOTE(willchan): Keep these protocol handlers in sync with
// ProfileIOData::IsHandledProtocol().
bool set_protocol = job_factory->SetProtocolHandler(
@@ -1224,11 +1224,10 @@ ProfileIOData::SetUpJobFactoryDefaults(
job_factory->SetProtocolHandler(
url::kAboutScheme,
base::MakeUnique<about_handler::AboutProtocolHandler>());
+
#if !defined(DISABLE_FTP_SUPPORT)
- DCHECK(ftp_transaction_factory);
job_factory->SetProtocolHandler(
- url::kFtpScheme,
- base::MakeUnique<net::FtpProtocolHandler>(ftp_transaction_factory));
+ url::kFtpScheme, net::FtpProtocolHandler::Create(host_resolver));
#endif // !defined(DISABLE_FTP_SUPPORT)
#if defined(DEBUG_DEVTOOLS)

Powered by Google App Engine
This is Rietveld 408576698