| Index: chrome/browser/profiles/profile_impl_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
|
| index 60a349f5438eb9de6d1ae9fbcaa01cec85decd3c..d2afc2846e3dfe38737926981551802134fe256b 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.cc
|
| @@ -456,17 +456,18 @@ void ProfileImplIOData::LazyInitializeInternal(
|
| extensions_job_factory_.reset(new net::URLRequestJobFactory);
|
|
|
| int set_protocol = main_job_factory_->SetProtocolHandler(
|
| - chrome::kFileScheme, new net::FileProtocolHandler(network_delegate()));
|
| + chrome::kFileScheme, new net::FileProtocolHandler());
|
| DCHECK(set_protocol);
|
| set_protocol = media_request_job_factory_->SetProtocolHandler(
|
| - chrome::kFileScheme, new net::FileProtocolHandler(network_delegate()));
|
| + chrome::kFileScheme, new net::FileProtocolHandler());
|
| DCHECK(set_protocol);
|
| - // TODO(shalev): Without a network_delegate this protocol handler will never
|
| + // TODO(shalev): The extensions_job_factory has a NULL NetworkDelegate.
|
| + // Without a network_delegate, this protocol handler will never
|
| // handle file: requests, but as a side effect it makes
|
| // job_factory::IsHandledProtocol return true, which prevents attempts to
|
| // handle the protocol externally.
|
| set_protocol = extensions_job_factory_->SetProtocolHandler(
|
| - chrome::kFileScheme, new net::FileProtocolHandler(NULL));
|
| + chrome::kFileScheme, new net::FileProtocolHandler());
|
| DCHECK(set_protocol);
|
|
|
| set_protocol = main_job_factory_->SetProtocolHandler(
|
| @@ -662,8 +663,7 @@ void ProfileImplIOData::CreateFtpProtocolHandler(
|
| net::FtpAuthCache* ftp_auth_cache) const {
|
| job_factory->SetProtocolHandler(
|
| chrome::kFtpScheme,
|
| - new net::FtpProtocolHandler(network_delegate(),
|
| - ftp_factory_.get(),
|
| + new net::FtpProtocolHandler(ftp_factory_.get(),
|
| ftp_auth_cache));
|
| }
|
|
|
|
|