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

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_context.h"
 #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"
 
 using content::BrowserThread;
 
 ProfileImplIOData::Handle::Handle(Profile* profile)
     : io_data_(new ProfileImplIOData),
       profile_(profile),
       initialized_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 385 matching lines @@
   main_http_factory_.reset(main_cache);
   media_http_factory_.reset(media_cache);
   main_context->set_http_transaction_factory(main_cache);
   media_request_context_->set_http_transaction_factory(media_cache);
 
   ftp_factory_.reset(
       new net::FtpNetworkLayer(io_thread_globals->host_resolver.get()));
   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());
+  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);
 
-  job_factory()->AddInterceptor(
+  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();
 }
 
 ChromeURLRequestContext*
 ProfileImplIOData::InitializeAppRequestContext(
     ChromeURLRequestContext* main_context,
     const std::string& app_id) const {
   AppRequestContext* context = new AppRequestContext;
 
@@ skipping 75 matching lines @@
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   LazyInitialize();
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);
   DCHECK(http_server_properties_manager());
   http_server_properties_manager()->Clear();
 }