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

chrome/browser/profiles/profile_io_data.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <string>
 
@@ skipping 158 matching lines @@
     void* profile;
   };
 
   explicit ProfileIOData(bool is_incognito);
 
   static std::string GetSSLSessionCacheShard();
 
   void InitializeOnUIThread(Profile* profile);
   void ApplyProfileParamsToContext(ChromeURLRequestContext* context) const;
 
+  void SetUpJobFactoryDefaults(net::URLRequestJobFactory* job_factory) const;
+
   // Lazy initializes the ProfileIOData object the first time a request context
   // is requested. The lazy logic is implemented here. The actual initialization
   // is done in LazyInitializeInternal(), implemented by subtypes. Static helper
   // functions have been provided to assist in common operations.
   void LazyInitialize() const;
 
   // Called when the profile is destroyed.
   void ShutdownOnUIThread();
 
   BooleanPrefMember* enable_referrers() const {
@@ skipping 16 matching lines @@
   }
 
   net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
     return fraudulent_certificate_reporter_.get();
   }
 
   net::ProxyService* proxy_service() const {
     return proxy_service_.get();
   }
 
   net::URLRequestJobFactory* job_factory() const {

[erikwright (departed), 2012/06/21 20:21:30]

Remove

[shalev, 2012/06/21 20:38:54]

Done.

     return job_factory_.get();
   }
 
   void set_http_server_properties_manager(
       chrome_browser_net::HttpServerPropertiesManager* manager) const;
 
   ChromeURLRequestContext* main_request_context() const {
     return main_request_context_.get();
   }
 
@@ skipping 89 matching lines @@
 
   // Pointed to by URLRequestContext.
   mutable scoped_ptr<ChromeURLDataManagerBackend>
       chrome_url_data_manager_backend_;
   mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
   mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
   mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;

[erikwright (departed), 2012/06/21 20:21:30]

Remove.

[shalev, 2012/06/21 20:38:54]

Done.

   mutable scoped_ptr<chrome_browser_net::HttpServerPropertiesManager>
       http_server_properties_manager_;
 
 #if defined(ENABLE_NOTIFICATIONS)
   mutable DesktopNotificationService* notification_service_;
 #endif
 
   mutable scoped_ptr<TransportSecurityPersister>
       transport_security_persister_;
 
@@ skipping 11 matching lines @@
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   bool is_incognito_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_