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

Unified Diff: net/url_request/url_request_context_builder.cc

Issue 2876243002: Add method to init HttpNetworkSession::Params from context bulder params (Closed)
Patch Set: Oops, base on top of trunk Created 3 years, 7 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 | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 90c240bc066c782bb82749cbe6cd03ad6ed61c05..8819f03e7f3c24abde48c09594189d92e2459d5d 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -181,15 +181,15 @@ URLRequestContextBuilder::HttpCacheParams::HttpCacheParams()
URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
- : ignore_certificate_errors(false),
- host_mapping_rules(NULL),
+ : host_mapping_rules(nullptr),
+ ignore_certificate_errors(false),
testing_fixed_http_port(0),
testing_fixed_https_port(0),
enable_http2(true),
enable_quic(false),
quic_max_server_configs_stored_in_properties(0),
- quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
quic_close_sessions_on_ip_change(false),
+ quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
quic_migrate_sessions_on_network_change(false),
quic_migrate_sessions_early(false),
quic_disable_bidirectional_streams(false),
@@ -198,6 +198,34 @@ URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
{}
+void URLRequestContextBuilder::HttpNetworkSessionParams::ConfigureSessionParams(
+ HttpNetworkSession::Params* network_session_params) const {
+ network_session_params->host_mapping_rules = host_mapping_rules;
+ network_session_params->ignore_certificate_errors = ignore_certificate_errors;
+ network_session_params->testing_fixed_http_port = testing_fixed_http_port;
+ network_session_params->testing_fixed_https_port = testing_fixed_https_port;
+
+ network_session_params->enable_http2 = enable_http2;
+
+ network_session_params->enable_quic = enable_quic;
+ network_session_params->quic_user_agent_id = quic_user_agent_id;
+ network_session_params->quic_max_server_configs_stored_in_properties =
+ quic_max_server_configs_stored_in_properties;
+ network_session_params->quic_connection_options = quic_connection_options;
+ network_session_params->quic_close_sessions_on_ip_change =
+ quic_close_sessions_on_ip_change;
+ network_session_params->quic_idle_connection_timeout_seconds =
+ quic_idle_connection_timeout_seconds;
+ network_session_params->quic_migrate_sessions_on_network_change =
+ quic_migrate_sessions_on_network_change;
+ network_session_params->quic_migrate_sessions_early =
+ quic_migrate_sessions_early;
+ network_session_params->quic_disable_bidirectional_streams =
+ quic_disable_bidirectional_streams;
+ network_session_params->quic_race_cert_verification =
+ quic_race_cert_verification;
+}
+
URLRequestContextBuilder::URLRequestContextBuilder()
: name_(nullptr),
enable_brotli_(false),
@@ -413,36 +441,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
HttpNetworkSession::Params network_session_params;
SetHttpNetworkSessionComponents(context.get(), &network_session_params);
+ http_network_session_params_.ConfigureSessionParams(&network_session_params);
- network_session_params.ignore_certificate_errors =
- http_network_session_params_.ignore_certificate_errors;
- network_session_params.host_mapping_rules =
- http_network_session_params_.host_mapping_rules;
- network_session_params.testing_fixed_http_port =
- http_network_session_params_.testing_fixed_http_port;
- network_session_params.testing_fixed_https_port =
- http_network_session_params_.testing_fixed_https_port;
- network_session_params.enable_http2 =
- http_network_session_params_.enable_http2;
- network_session_params.enable_quic = http_network_session_params_.enable_quic;
- network_session_params.quic_max_server_configs_stored_in_properties =
- http_network_session_params_.quic_max_server_configs_stored_in_properties;
- network_session_params.quic_idle_connection_timeout_seconds =
- http_network_session_params_.quic_idle_connection_timeout_seconds;
- network_session_params.quic_connection_options =
- http_network_session_params_.quic_connection_options;
- network_session_params.quic_close_sessions_on_ip_change =
- http_network_session_params_.quic_close_sessions_on_ip_change;
- network_session_params.quic_migrate_sessions_on_network_change =
- http_network_session_params_.quic_migrate_sessions_on_network_change;
- network_session_params.quic_user_agent_id =
- http_network_session_params_.quic_user_agent_id;
- network_session_params.quic_migrate_sessions_early =
- http_network_session_params_.quic_migrate_sessions_early;
- network_session_params.quic_disable_bidirectional_streams =
- http_network_session_params_.quic_disable_bidirectional_streams;
- network_session_params.quic_race_cert_verification =
- http_network_session_params_.quic_race_cert_verification;
if (proxy_delegate_) {
network_session_params.proxy_delegate = proxy_delegate_.get();
storage->set_proxy_delegate(std::move(proxy_delegate_));
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698