summaryrefslogtreecommitdiffstats
path: root/net/url_request/ftp_protocol_handler.cc
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 03:05:50 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 03:05:50 +0000
commite13c14645c5e2777d15c586483d7f29255f260fa (patch)
tree6eba85cf6b97ce1636a2a1dc4873cd11d6d122e4 /net/url_request/ftp_protocol_handler.cc
parent433739c4481fee1967d815207863a9a06fd18db2 (diff)
downloadchromium_src-e13c14645c5e2777d15c586483d7f29255f260fa.zip
chromium_src-e13c14645c5e2777d15c586483d7f29255f260fa.tar.gz
chromium_src-e13c14645c5e2777d15c586483d7f29255f260fa.tar.bz2
Revert 188912 "Removed static factories for data, ftp, file, and..."
Broke layout tests userscripts/user-script-plugin-document.html and plugins/plugin-document-back-forward.html on all platforms. > Removed static factories for data, ftp, file, and about jobs. > Instead add corresponding ProtocolHandlers as needed. > Remove URLRequestContext members used by these static > factories. Bake FtpAuthCache into FtpProtocolHandler as it > was already unique per FtpProtocolHandler. > This is a revived version of http://crrev.com/10836206 > > BUG=142945 > > > Review URL: https://chromiumcodereview.appspot.com/11931024 TBR=pauljensen@chromium.org Review URL: https://codereview.chromium.org/12605011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/ftp_protocol_handler.cc')
-rw-r--r--net/url_request/ftp_protocol_handler.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/url_request/ftp_protocol_handler.cc b/net/url_request/ftp_protocol_handler.cc
index 08071f3..7d9ba88 100644
--- a/net/url_request/ftp_protocol_handler.cc
+++ b/net/url_request/ftp_protocol_handler.cc
@@ -15,9 +15,12 @@
namespace net {
FtpProtocolHandler::FtpProtocolHandler(
- FtpTransactionFactory* ftp_transaction_factory)
- : ftp_transaction_factory_(ftp_transaction_factory) {
+ FtpTransactionFactory* ftp_transaction_factory,
+ FtpAuthCache* ftp_auth_cache)
+ : ftp_transaction_factory_(ftp_transaction_factory),
+ ftp_auth_cache_(ftp_auth_cache) {
DCHECK(ftp_transaction_factory_);
+ DCHECK(ftp_auth_cache_);
}
URLRequestJob* FtpProtocolHandler::MaybeCreateJob(
@@ -31,7 +34,7 @@ URLRequestJob* FtpProtocolHandler::MaybeCreateJob(
return new URLRequestFtpJob(request,
network_delegate,
ftp_transaction_factory_,
- &ftp_auth_cache_);
+ ftp_auth_cache_);
}
} // namespace net