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

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

Issue 1288383002: Use common code to set HttpNetworkSession::Param pointers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove check, http_cache_enabled_ || !channel_id_service. Created 5 years, 4 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/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 179ca0ee1d2475c009829a15a869d4675b839d49..57ce08c83dfaa5c3cd4d024d1b0f4145d6208ed9 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -79,6 +79,7 @@
#include "net/url_request/ftp_protocol_handler.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_file_job.h"
#include "net/url_request/url_request_intercepting_job_factory.h"
#include "net/url_request/url_request_interceptor.h"
@@ -1295,19 +1296,11 @@ scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory(
IOThread* const io_thread = profile_params->io_thread;
io_thread->InitializeNetworkSessionParams(&params);
+ net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(&params,
+ context);
- params.host_resolver = context->host_resolver();
- params.cert_verifier = context->cert_verifier();
- params.channel_id_service = context->channel_id_service();
- params.transport_security_state = context->transport_security_state();
- params.cert_transparency_verifier = context->cert_transparency_verifier();
- params.proxy_service = context->proxy_service();
+ // TODO(wjmaclean): should this move into the function call above?
params.ssl_session_cache_shard = GetSSLSessionCacheShard();
mmenke 2015/08/17 20:13:04 If you're wondering what this is (I know I was...)
wjmaclean 2015/08/18 14:17:23 Acknowledged.
- params.ssl_config_service = context->ssl_config_service();
- params.http_auth_handler_factory = context->http_auth_handler_factory();
- params.network_delegate = context->network_delegate();
- params.http_server_properties = context->http_server_properties();
- params.net_log = context->net_log();
if (data_reduction_proxy_io_data_.get())
params.proxy_delegate = data_reduction_proxy_io_data_->proxy_delegate();

Powered by Google App Engine
This is Rietveld 408576698