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

Unified Diff: chrome/browser/profiles/off_the_record_profile_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
Index: chrome/browser/profiles/off_the_record_profile_io_data.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc
index 7128a0bedad30e84c0d12310dcb8d299d4834c64..830d6df17e42294fb8ae4fb32561180725cc1835 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.cc
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc
@@ -27,6 +27,7 @@
#include "net/ftp/ftp_network_layer.h"
#include "net/http/http_cache.h"
#include "net/http/http_server_properties_impl.h"
+#include "net/url_request/ftp_protocol_handler.h"
#include "net/url_request/url_request_job_factory.h"
#include "webkit/database/database_tracker.h"
@@ -254,8 +255,13 @@ void OffTheRecordProfileIOData::LazyInitializeInternal(
job_factories[0] = main_job_factory_.get();
job_factories[1] = extensions_job_factory_.get();
+ net::FtpAuthCache* ftp_auth_caches[2];
+ ftp_auth_caches[0] = main_context->ftp_auth_cache();
+ ftp_auth_caches[1] = extensions_context->ftp_auth_cache();
+
for (int i = 0; i < 2; i++) {
SetUpJobFactoryDefaults(job_factories[i]);
+ CreateFtpProtocolHandler(job_factories[i], ftp_auth_caches[i]);
}
main_context->set_job_factory(main_job_factory_.get());
@@ -304,3 +310,13 @@ OffTheRecordProfileIOData::AcquireIsolatedAppRequestContext(
DCHECK(app_request_context);
return app_request_context;
}
+
+void OffTheRecordProfileIOData::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));
+}
+
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.h ('k') | chrome/browser/profiles/profile_impl_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698