Removed static factories for data, ftp, file, and about jobs.

chrome/browser/profiles/off_the_record_profile_io_data.cc

Index: chrome/browser/profiles/off_the_record_profile_io_data.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc
index 057c10a134cb553ee160a87a73ac5bd10583580b..5d9f36c97144df05bfbf87af667b2da84d642d42 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.cc
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc
@@ -209,7 +209,6 @@ void OffTheRecordProfileIOData::LazyInitializeInternal(
 #if !defined(DISABLE_FTP_SUPPORT)
   ftp_factory_.reset(
       new net::FtpNetworkLayer(main_context->host_resolver()));
-  main_context->set_ftp_transaction_factory(ftp_factory_.get());
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
   scoped_ptr<net::URLRequestJobFactoryImpl> main_job_factory(
@@ -219,8 +218,7 @@ void OffTheRecordProfileIOData::LazyInitializeInternal(
       main_job_factory.Pass(),
       profile_params->protocol_handler_interceptor.Pass(),
       network_delegate(),
-      main_context->ftp_transaction_factory(),
-      main_context->ftp_auth_cache());
+      ftp_factory_.get());
   main_context->set_job_factory(main_job_factory_.get());
 
 #if defined(ENABLE_EXTENSIONS)
@@ -255,8 +253,7 @@ void OffTheRecordProfileIOData::
   extensions_context->set_cookie_store(extensions_cookie_store);
 
 #if !defined(DISABLE_FTP_SUPPORT)

[erikwright (departed), 2013/01/21 16:20:13]

I think the remainder of this #if block can be canned, as it seems to have
existed only to call set_ftp_transaction_factory.

-  DCHECK(ftp_factory_.get());
-  extensions_context->set_ftp_transaction_factory(ftp_factory_.get());
+  DCHECK(ftp_factory_);
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
   scoped_ptr<net::URLRequestJobFactoryImpl> extensions_job_factory(
@@ -271,8 +268,7 @@ void OffTheRecordProfileIOData::
       extensions_job_factory.Pass(),
       scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>(NULL),
       NULL,
-      extensions_context->ftp_transaction_factory(),
-      extensions_context->ftp_auth_cache());
+      ftp_factory_.get());
   extensions_context->set_job_factory(extensions_job_factory_.get());
 }
 
@@ -302,14 +298,17 @@ OffTheRecordProfileIOData::InitializeAppRequestContext(
 
   context->SetHttpTransactionFactory(app_http_cache.Pass());
 
+#if !defined(DISABLE_FTP_SUPPORT)

[erikwright (departed), 2013/01/21 16:20:13]

Don't think this is needed, for the same reasons mentioned above.

+  DCHECK(ftp_factory_);
+#endif  // !defined(DISABLE_FTP_SUPPORT)
+
   scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
       new net::URLRequestJobFactoryImpl());
   scoped_ptr<net::URLRequestJobFactory> top_job_factory;
   top_job_factory = SetUpJobFactoryDefaults(job_factory.Pass(),
                                             protocol_handler_interceptor.Pass(),
                                             network_delegate(),
-                                            context->ftp_transaction_factory(),
-                                            context->ftp_auth_cache());
+                                            ftp_factory_.get());
   context->SetJobFactory(top_job_factory.Pass());
   return context;
 }