Chromium Code Reviews| 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 a2131ecacd1ea92bc55c6257e320a627bd9c67f8..441ed1083ad86c242e8d991ba8d64e17e8e864e7 100644 |
| --- a/chrome/browser/profiles/profile_io_data.cc |
| +++ b/chrome/browser/profiles/profile_io_data.cc |
| @@ -333,16 +333,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, |
|
mmenke
2013/01/22 16:50:37
Why change the order of this and kExtensionResourc
pauljensen
2013/01/23 21:43:33
To better match ProfileIOData::SetUpJobFactoryDefa
|
| extensions::kExtensionScheme, |
| + chrome::kExtensionResourceScheme, |
| chrome::kChromeUIScheme, |
| - chrome::kChromeDevToolsScheme, |
| + chrome::kDataScheme, |
| #if defined(OS_CHROMEOS) |
| - chrome::kMetadataScheme, |
|
mmenke
2013/01/22 16:50:37
Why are you removing this?
pauljensen
2013/01/23 21:43:33
It was added in r85556 along with the ProtocolHand
|
| 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]) |
| @@ -612,8 +617,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( |
| @@ -658,8 +662,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) |
| if (protocol_handler_interceptor) { |