Index: trunk/src/chrome/browser/profiles/profile_io_data.cc |
=================================================================== |
--- trunk/src/chrome/browser/profiles/profile_io_data.cc (revision 188924) |
+++ trunk/src/chrome/browser/profiles/profile_io_data.cc (working copy) |
@@ -421,21 +421,16 @@ |
bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { |
DCHECK_EQ(scheme, StringToLowerASCII(scheme)); |
static const char* const kProtocolList[] = { |
- chrome::kFileScheme, |
- chrome::kChromeDevToolsScheme, |
extensions::kExtensionScheme, |
- chrome::kExtensionResourceScheme, |
chrome::kChromeUIScheme, |
- chrome::kDataScheme, |
+ chrome::kChromeDevToolsScheme, |
#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) { |
@@ -717,7 +712,8 @@ |
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( |
@@ -752,7 +748,8 @@ |
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 = |