Replaced static URLRequestFtpJob factory with non-static protocol handler for FTP jobs.

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 f3f3c158339b9a6797e3e2fec12f45569036fa77..99b98d2e363e3fb251e34ae7a3a4804a7f6d6823 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -30,6 +30,7 @@
 #include "net/base/server_bound_cert_service.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
+#include "net/url_request/ftp_protocol_handler.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "webkit/quota/special_storage_policy.h"
 
@@ -435,15 +436,39 @@ void ProfileImplIOData::LazyInitializeInternal(
   main_context->set_ftp_transaction_factory(ftp_factory_.get());
   media_request_context_->set_ftp_transaction_factory(ftp_factory_.get());
 
+  ftp_auth_cache_.reset(new net::FtpAuthCache);
+
   main_context->set_chrome_url_data_manager_backend(
       chrome_url_data_manager_backend());
 
-  main_context->set_job_factory(job_factory());
-  media_request_context_->set_job_factory(job_factory());
-  extensions_context->set_job_factory(job_factory());
-
-  job_factory()->AddInterceptor(
+  main_factory_.reset(new net::URLRequestJobFactory);

[erikwright (departed), 2012/06/13 15:31:42]

rename as requested in OffTheRecord...

[shalev, 2012/06/21 20:04:55]

Done.

+  media_request_factory_.reset(new net::URLRequestJobFactory);
+  extensions_factory_.reset(new net::URLRequestJobFactory);
+
+  SetUpJobFactoryDefaults(main_factory_.get());
+  SetUpJobFactoryDefaults(media_request_factory_.get());
+  SetUpJobFactoryDefaults(extensions_factory_.get());
+
+  main_factory_->SetProtocolHandler(chrome::kFtpScheme,
+                                    new net::FtpProtocolHandler(
+      network_delegate(), ftp_factory_.get(), ftp_auth_cache_.get()));
+  media_request_factory_->SetProtocolHandler(chrome::kFtpScheme,
+                                             new net::FtpProtocolHandler(
+      network_delegate(), ftp_factory_.get(), ftp_auth_cache_.get()));
+  extensions_factory_->SetProtocolHandler(chrome::kFtpScheme,
+                                          new net::FtpProtocolHandler(
+      network_delegate(), ftp_factory_.get(), ftp_auth_cache_.get()));
+
+  main_factory_->AddInterceptor(
+      new chrome_browser_net::ConnectInterceptor(predictor_.get()));
+  media_request_factory_->AddInterceptor(
       new chrome_browser_net::ConnectInterceptor(predictor_.get()));
+  extensions_factory_->AddInterceptor(
+      new chrome_browser_net::ConnectInterceptor(predictor_.get()));
+
+  main_context->set_job_factory(main_factory_.get());
+  media_request_context_->set_job_factory(media_request_factory_.get());
+  extensions_context->set_job_factory(extensions_factory_.get());
 
   lazy_params_.reset();
 }