Index: chrome/browser/profiles/profile_io_data.cc |
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
index 26c314b454f0c518890ab196c4aafb3118829cbb..224fecbd100eb4bffef2fe86bf919f703e96c8bf 100644 |
--- a/chrome/browser/profiles/profile_io_data.cc |
+++ b/chrome/browser/profiles/profile_io_data.cc |
@@ -414,16 +414,21 @@ ProfileIOData* ProfileIOData::FromResourceContext( |
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::kChromeDevToolsScheme, |
+ 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::kFileSystemScheme |
}; |
for (size_t i = 0; i < arraysize(kProtocolList); ++i) { |
if (scheme == kProtocolList[i]) |
@@ -711,8 +716,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( |
scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> |
protocol_handler_interceptor, |
net::NetworkDelegate* network_delegate, |
- net::FtpTransactionFactory* ftp_transaction_factory, |
- net::FtpAuthCache* ftp_auth_cache) const { |
+ net::FtpTransactionFactory* ftp_transaction_factory) const { |
// NOTE(willchan): Keep these protocol handlers in sync with |
// ProfileIOData::IsHandledProtocol(). |
bool set_protocol = job_factory->SetProtocolHandler( |
@@ -747,8 +751,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( |
DCHECK(ftp_transaction_factory); |
job_factory->SetProtocolHandler( |
chrome::kFtpScheme, |
- new net::FtpProtocolHandler(ftp_transaction_factory, |
- ftp_auth_cache)); |
+ new net::FtpProtocolHandler(ftp_transaction_factory)); |
#endif // !defined(DISABLE_FTP_SUPPORT) |
scoped_ptr<net::URLRequestJobFactory> top_job_factory = |