Clean up FtpTransactionFacory ownership.

chrome/browser/profiles/profile_impl_io_data.cc

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 a2680af2597f5ad08869f40ecc01320ebabcebf7..6c7ba026349c0819ec5a52de2271eeeba507a94b 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -63,7 +63,6 @@
 #include "net/base/cache_type.h"
 #include "net/base/sdch_manager.h"
 #include "net/cookies/cookie_store.h"
-#include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties_manager.h"
@@ -533,11 +532,6 @@ void ProfileImplIOData::InitializeInternal(
   main_context_storage->set_http_transaction_factory(CreateMainHttpFactory(
       main_context_storage->http_network_session(), std::move(main_backend)));
 
-#if !defined(DISABLE_FTP_SUPPORT)
-  ftp_factory_.reset(
-      new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
-#endif  // !defined(DISABLE_FTP_SUPPORT)
-
   std::unique_ptr<net::URLRequestJobFactoryImpl> main_job_factory(
       new net::URLRequestJobFactoryImpl());
   InstallProtocolHandlers(main_job_factory.get(), protocol_handlers);
@@ -557,7 +551,8 @@ void ProfileImplIOData::InitializeInternal(
   main_context_storage->set_job_factory(SetUpJobFactoryDefaults(
       std::move(main_job_factory), std::move(request_interceptors),
       std::move(profile_params->protocol_handler_interceptor),
-      main_context->network_delegate(), ftp_factory_.get()));
+      main_context->network_delegate(),
+      io_thread_globals->host_resolver.get()));
   main_context->set_network_quality_estimator(
       io_thread_globals->network_quality_estimator.get());
 
@@ -618,7 +613,7 @@ void ProfileImplIOData::
       std::move(extensions_job_factory),
       content::URLRequestInterceptorScopedVector(),
       std::unique_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>(), NULL,
-      ftp_factory_.get());
+      io_thread_globals->host_resolver.get());
   extensions_context->set_job_factory(extensions_job_factory_.get());
 }
 
@@ -712,7 +707,7 @@ net::URLRequestContext* ProfileImplIOData::InitializeAppRequestContext(
       SetUpJobFactoryDefaults(
           std::move(job_factory), std::move(request_interceptors),
           std::move(protocol_handler_interceptor),
-          main_context->network_delegate(), ftp_factory_.get()));
+          main_context->network_delegate(), main_context->host_resolver()));

[eroman, 2016/10/19 16:29:51]

I think this would be clearer if it accessed the io thread global host resolver
directly (even if less general)

[mmenke, 2016/10/19 17:09:35]

We don't have access to IOThread here - the two methods that use it get it from
ProfileParams, which is passed from the UI thread via ProfileImplIOData::Handle,
and then destroyed when we're done with it.  We could just grab it from
g_browser_process, I guess (g_browser_process does outlive the IOThread), but
then we should get rid of it as a member of ProfileParams and access it the same
way elsewhere in this file.

I've switched to just using context->host_resolver (i.e., the resolver we've
already set on the new context).  Seem reasonable?  Did the same for the
incognito code.

   context->SetJobFactory(std::move(top_job_factory));
 
   return context;