Revert 188912 "Removed static factories for data, ftp, file, and..."

trunk/src/chrome/browser/profiles/profile_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_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 403 matching lines @@
 // static
 ProfileIOData* ProfileIOData::FromResourceContext(
     content::ResourceContext* rc) {
   return (static_cast<ResourceContext*>(rc))->io_data_;
 }
 
 // static
 bool ProfileIOData::IsHandledProtocol(const std::string& scheme) {
   DCHECK_EQ(scheme, StringToLowerASCII(scheme));
   static const char* const kProtocolList[] = {
-    chrome::kFileScheme,
+    extensions::kExtensionScheme,
+    chrome::kChromeUIScheme,
     chrome::kChromeDevToolsScheme,
-    extensions::kExtensionScheme,
-    chrome::kExtensionResourceScheme,
-    chrome::kChromeUIScheme,
-    chrome::kDataScheme,
 #if defined(OS_CHROMEOS)
+    chrome::kMetadataScheme,
     chrome::kDriveScheme,
 #endif  // defined(OS_CHROMEOS)
-    chrome::kAboutScheme,
-#if !defined(DISABLE_FTP_SUPPORT)
-    chrome::kFtpScheme,
-#endif  // !defined(DISABLE_FTP_SUPPORT)
     chrome::kBlobScheme,
     chrome::kFileSystemScheme,
+    chrome::kExtensionResourceScheme,
     chrome::kChromeSearchScheme,
   };
   for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
     if (scheme == kProtocolList[i])
       return true;
   }
   return net::URLRequest::IsHandledProtocol(scheme);
 }
 
 // static
@@ skipping 261 matching lines @@
   context->set_http_user_agent_settings(
       chrome_http_user_agent_settings_.get());
   context->set_ssl_config_service(profile_params_->ssl_config_service);
 }
 
 scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults(
     scoped_ptr<net::URLRequestJobFactoryImpl> job_factory,
     scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
         protocol_handler_interceptor,
     net::NetworkDelegate* network_delegate,
-    net::FtpTransactionFactory* ftp_transaction_factory) const {
+    net::FtpTransactionFactory* ftp_transaction_factory,
+    net::FtpAuthCache* ftp_auth_cache) const {
   // NOTE(willchan): Keep these protocol handlers in sync with
   // ProfileIOData::IsHandledProtocol().
   bool set_protocol = job_factory->SetProtocolHandler(
       chrome::kFileScheme, new net::FileProtocolHandler());
   DCHECK(set_protocol);
 
   DCHECK(extension_info_map_);
   set_protocol = job_factory->SetProtocolHandler(
       extensions::kExtensionScheme,
       CreateExtensionProtocolHandler(is_incognito(), extension_info_map_));
@@ skipping 14 matching lines @@
   }
 #endif  // defined(OS_CHROMEOS)
 
   job_factory->SetProtocolHandler(
       chrome::kAboutScheme,
       new chrome_browser_net::AboutProtocolHandler());
 #if !defined(DISABLE_FTP_SUPPORT)
   DCHECK(ftp_transaction_factory);
   job_factory->SetProtocolHandler(
       chrome::kFtpScheme,
-      new net::FtpProtocolHandler(ftp_transaction_factory));
+      new net::FtpProtocolHandler(ftp_transaction_factory,
+                                  ftp_auth_cache));
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
   scoped_ptr<net::URLRequestJobFactory> top_job_factory =
       job_factory.PassAs<net::URLRequestJobFactory>();
 #if defined(DEBUG_DEVTOOLS)
   top_job_factory.reset(new net::ProtocolInterceptJobFactory(
       top_job_factory.Pass(),
       scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
           new DebugDevToolsInterceptor)));
 #endif
@@ skipping 73 matching lines @@
 void ProfileIOData::SetCookieSettingsForTesting(
     CookieSettings* cookie_settings) {
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }
 
 void ProfileIOData::set_signin_names_for_testing(
     SigninNamesOnIOThread* signin_names) {
   signin_names_.reset(signin_names);
 }