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

Unified Diff: trunk/src/net/url_request/url_request_context.cc

Issue 12605011: Revert 188912 "Removed static factories for data, ftp, file, and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 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: trunk/src/net/url_request/url_request_context.cc
===================================================================
--- trunk/src/net/url_request/url_request_context.cc (revision 188924)
+++ trunk/src/net/url_request/url_request_context.cc (working copy)
@@ -10,6 +10,7 @@
#include "base/string_util.h"
#include "net/base/host_resolver.h"
#include "net/cookies/cookie_store.h"
+#include "net/ftp/ftp_transaction_factory.h"
#include "net/http/http_transaction_factory.h"
#include "net/url_request/http_user_agent_settings.h"
#include "net/url_request/url_request.h"
@@ -28,7 +29,11 @@
http_server_properties_(NULL),
http_user_agent_settings_(NULL),
transport_security_state_(NULL),
+#if !defined(DISABLE_FTP_SUPPORT)
+ ftp_auth_cache_(new FtpAuthCache),
+#endif
http_transaction_factory_(NULL),
+ ftp_transaction_factory_(NULL),
job_factory_(NULL),
throttler_manager_(NULL),
url_requests_(new std::set<const URLRequest*>) {
@@ -52,7 +57,9 @@
set_http_server_properties(other->http_server_properties_);
set_cookie_store(other->cookie_store_);
set_transport_security_state(other->transport_security_state_);
+ // FTPAuthCache is unique per context.
set_http_transaction_factory(other->http_transaction_factory_);
+ set_ftp_transaction_factory(other->ftp_transaction_factory_);
set_job_factory(other->job_factory_);
set_throttler_manager(other->throttler_manager_);
set_http_user_agent_settings(other->http_user_agent_settings_);
« no previous file with comments | « trunk/src/net/url_request/url_request_context.h ('k') | trunk/src/net/url_request/url_request_context_builder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698