| Index: net/url_request/ftp_protocol_handler.cc
|
| diff --git a/net/url_request/ftp_protocol_handler.cc b/net/url_request/ftp_protocol_handler.cc
|
| index b9dc0fa05f8201cc0ca6b8e21690b7e8934909b5..7d9ba8858547f4945d08d635df7f37e6ddf0a95e 100644
|
| --- a/net/url_request/ftp_protocol_handler.cc
|
| +++ b/net/url_request/ftp_protocol_handler.cc
|
| @@ -15,26 +15,24 @@
|
| namespace net {
|
|
|
| FtpProtocolHandler::FtpProtocolHandler(
|
| - NetworkDelegate* network_delegate,
|
| FtpTransactionFactory* ftp_transaction_factory,
|
| FtpAuthCache* ftp_auth_cache)
|
| - : network_delegate_(network_delegate),
|
| - ftp_transaction_factory_(ftp_transaction_factory),
|
| + : ftp_transaction_factory_(ftp_transaction_factory),
|
| ftp_auth_cache_(ftp_auth_cache) {
|
| DCHECK(ftp_transaction_factory_);
|
| DCHECK(ftp_auth_cache_);
|
| }
|
|
|
| URLRequestJob* FtpProtocolHandler::MaybeCreateJob(
|
| - URLRequest* request) const {
|
| + URLRequest* request, NetworkDelegate* network_delegate) const {
|
| int port = request->url().IntPort();
|
| if (request->url().has_port() &&
|
| !IsPortAllowedByFtp(port) && !IsPortAllowedByOverride(port)) {
|
| - return new URLRequestErrorJob(request, ERR_UNSAFE_PORT);
|
| + return new URLRequestErrorJob(request, network_delegate, ERR_UNSAFE_PORT);
|
| }
|
|
|
| return new URLRequestFtpJob(request,
|
| - network_delegate_,
|
| + network_delegate,
|
| ftp_transaction_factory_,
|
| ftp_auth_cache_);
|
| }
|
|
|