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 14 matching lines @@
 #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/url_request_job_factory.h"
 #include "webkit/quota/special_storage_policy.h"
+#include "net/url_request/url_request_ftp_job.h"

[erikwright (departed), 2012/06/07 19:14:51]

Probably don't need url_request_ftp_job.h anymore.

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

Done.

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

Done.

+#include "net/ftp/ftp_auth_cache.h"
+#include "net/url_request/ftp_protocol_handler.h"

[Paweł Hajdan Jr., 2012/06/07 19:30:21]

nit: Hey, keep the headers sorted!

1. #include net should be sorted.
2. That webkit header above should also go to its right place.

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

Done.

 
 using content::BrowserThread;
 
 ProfileImplIOData::Handle::Handle(Profile* profile)
     : io_data_(new ProfileImplIOData),
       profile_(profile),
       initialized_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(profile);
 }
@@ skipping 398 matching lines @@
   main_context->set_ftp_transaction_factory(ftp_factory_.get());
   media_request_context_->set_ftp_transaction_factory(ftp_factory_.get());
 
   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()->SetProtocolHandler(chrome::kFtpScheme,
+                                    new net::FtpProtocolHandler(
+      network_delegate(), ftp_factory_.get(), new net::FtpAuthCache));
+
   job_factory()->AddInterceptor(
       new chrome_browser_net::ConnectInterceptor(predictor_.get()));
 
   lazy_params_.reset();
 }
 
 ChromeURLRequestContext*
 ProfileImplIOData::InitializeAppRequestContext(
     ChromeURLRequestContext* main_context,
     const std::string& app_id) const {
@@ 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();
 }