Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(549)

Unified Diff: chrome/browser/profiles/profile_impl_io_data.cc

Issue 10537056: Replaced static URLRequestFtpJob factory with non-static protocol handler for FTP jobs. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merged with latest sync Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.h ('k') | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bf5bc50e477d7fab725fb158e95b5759f445d52d..da2887875a1312af88ad47a7f156927238444cdc 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -30,6 +30,7 @@
#include "net/base/server_bound_cert_service.h"
#include "net/ftp/ftp_network_layer.h"
#include "net/http/http_cache.h"
+#include "net/url_request/ftp_protocol_handler.h"
#include "net/url_request/url_request_job_factory.h"
#include "webkit/quota/special_storage_policy.h"
@@ -446,8 +447,14 @@ void ProfileImplIOData::LazyInitializeInternal(
job_factories[1] = media_request_job_factory_.get();
job_factories[2] = extensions_job_factory_.get();
+ net::FtpAuthCache* ftp_auth_caches[3];
+ ftp_auth_caches[0] = main_context->ftp_auth_cache();
+ ftp_auth_caches[1] = media_request_context_->ftp_auth_cache();
+ ftp_auth_caches[2] = extensions_context->ftp_auth_cache();
+
for (int i = 0; i < 3; i++) {
SetUpJobFactoryDefaults(job_factories[i]);
+ CreateFtpProtocolHandler(job_factories[i], ftp_auth_caches[i]);
job_factories[i]->AddInterceptor(
new chrome_browser_net::ConnectInterceptor(predictor_.get()));
}
@@ -540,6 +547,16 @@ ProfileImplIOData::AcquireIsolatedAppRequestContext(
return app_request_context;
}
+void ProfileImplIOData::CreateFtpProtocolHandler(
+ net::URLRequestJobFactory* job_factory,
+ net::FtpAuthCache* ftp_auth_cache) const {
+ job_factory->SetProtocolHandler(
+ chrome::kFtpScheme,
+ new net::FtpProtocolHandler(network_delegate(),
+ ftp_factory_.get(),
+ ftp_auth_cache));
+}
+
void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
base::Time time) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.h ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698