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

Side by Side Diff: net/url_request/url_request_context_builder.cc

Issue 2011983002: Remove |parse_alternative_service| flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/url_request/url_request_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 max_size(0) {} 175 max_size(0) {}
176 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} 176 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
177 177
178 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams() 178 URLRequestContextBuilder::HttpNetworkSessionParams::HttpNetworkSessionParams()
179 : ignore_certificate_errors(false), 179 : ignore_certificate_errors(false),
180 host_mapping_rules(NULL), 180 host_mapping_rules(NULL),
181 testing_fixed_http_port(0), 181 testing_fixed_http_port(0),
182 testing_fixed_https_port(0), 182 testing_fixed_https_port(0),
183 enable_spdy31(false), 183 enable_spdy31(false),
184 enable_http2(true), 184 enable_http2(true),
185 parse_alternative_services(true),
186 enable_alternative_service_with_different_host(true), 185 enable_alternative_service_with_different_host(true),
187 enable_quic(false), 186 enable_quic(false),
188 quic_max_server_configs_stored_in_properties(0), 187 quic_max_server_configs_stored_in_properties(0),
189 quic_delay_tcp_race(true), 188 quic_delay_tcp_race(true),
190 quic_max_number_of_lossy_connections(0), 189 quic_max_number_of_lossy_connections(0),
191 quic_prefer_aes(false), 190 quic_prefer_aes(false),
192 quic_packet_loss_threshold(1.0f), 191 quic_packet_loss_threshold(1.0f),
193 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds), 192 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
194 quic_close_sessions_on_ip_change(false), 193 quic_close_sessions_on_ip_change(false),
195 quic_migrate_sessions_on_network_change(false), 194 quic_migrate_sessions_on_network_change(false),
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 network_session_params.host_mapping_rules = 404 network_session_params.host_mapping_rules =
406 http_network_session_params_.host_mapping_rules; 405 http_network_session_params_.host_mapping_rules;
407 network_session_params.testing_fixed_http_port = 406 network_session_params.testing_fixed_http_port =
408 http_network_session_params_.testing_fixed_http_port; 407 http_network_session_params_.testing_fixed_http_port;
409 network_session_params.testing_fixed_https_port = 408 network_session_params.testing_fixed_https_port =
410 http_network_session_params_.testing_fixed_https_port; 409 http_network_session_params_.testing_fixed_https_port;
411 network_session_params.enable_spdy31 = 410 network_session_params.enable_spdy31 =
412 http_network_session_params_.enable_spdy31; 411 http_network_session_params_.enable_spdy31;
413 network_session_params.enable_http2 = 412 network_session_params.enable_http2 =
414 http_network_session_params_.enable_http2; 413 http_network_session_params_.enable_http2;
415 network_session_params.parse_alternative_services =
416 http_network_session_params_.parse_alternative_services;
417 network_session_params.enable_alternative_service_with_different_host = 414 network_session_params.enable_alternative_service_with_different_host =
418 http_network_session_params_ 415 http_network_session_params_
419 .enable_alternative_service_with_different_host; 416 .enable_alternative_service_with_different_host;
420 network_session_params.enable_quic = http_network_session_params_.enable_quic; 417 network_session_params.enable_quic = http_network_session_params_.enable_quic;
421 network_session_params.quic_max_server_configs_stored_in_properties = 418 network_session_params.quic_max_server_configs_stored_in_properties =
422 http_network_session_params_.quic_max_server_configs_stored_in_properties; 419 http_network_session_params_.quic_max_server_configs_stored_in_properties;
423 network_session_params.quic_delay_tcp_race = 420 network_session_params.quic_delay_tcp_race =
424 http_network_session_params_.quic_delay_tcp_race; 421 http_network_session_params_.quic_delay_tcp_race;
425 network_session_params.quic_max_number_of_lossy_connections = 422 network_session_params.quic_max_number_of_lossy_connections =
426 http_network_session_params_.quic_max_number_of_lossy_connections; 423 http_network_session_params_.quic_max_number_of_lossy_connections;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 } 515 }
519 url_request_interceptors_.clear(); 516 url_request_interceptors_.clear();
520 } 517 }
521 storage->set_job_factory(std::move(top_job_factory)); 518 storage->set_job_factory(std::move(top_job_factory));
522 // TODO(willchan): Support sdch. 519 // TODO(willchan): Support sdch.
523 520
524 return std::move(context); 521 return std::move(context);
525 } 522 }
526 523
527 } // namespace net 524 } // namespace net
OLDNEW
« 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