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

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

Issue 2137843002: Revert of QUIC - Race Cert Verification with host resolution if certs are (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 enable_quic(false), 186 enable_quic(false),
187 quic_max_server_configs_stored_in_properties(0), 187 quic_max_server_configs_stored_in_properties(0),
188 quic_delay_tcp_race(true), 188 quic_delay_tcp_race(true),
189 quic_max_number_of_lossy_connections(0), 189 quic_max_number_of_lossy_connections(0),
190 quic_prefer_aes(false), 190 quic_prefer_aes(false),
191 quic_packet_loss_threshold(1.0f), 191 quic_packet_loss_threshold(1.0f),
192 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds), 192 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
193 quic_close_sessions_on_ip_change(false), 193 quic_close_sessions_on_ip_change(false),
194 quic_migrate_sessions_on_network_change(false), 194 quic_migrate_sessions_on_network_change(false),
195 quic_migrate_sessions_early(false), 195 quic_migrate_sessions_early(false),
196 quic_disable_bidirectional_streams(false), 196 quic_disable_bidirectional_streams(false) {}
197 quic_race_cert_verification(false) {}
198 197
199 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() 198 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
200 {} 199 {}
201 200
202 URLRequestContextBuilder::URLRequestContextBuilder() 201 URLRequestContextBuilder::URLRequestContextBuilder()
203 : data_enabled_(false), 202 : data_enabled_(false),
204 #if !defined(DISABLE_FILE_SUPPORT) 203 #if !defined(DISABLE_FILE_SUPPORT)
205 file_enabled_(false), 204 file_enabled_(false),
206 #endif 205 #endif
207 #if !defined(DISABLE_FTP_SUPPORT) 206 #if !defined(DISABLE_FTP_SUPPORT)
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 network_session_params.quic_migrate_sessions_on_network_change = 434 network_session_params.quic_migrate_sessions_on_network_change =
436 http_network_session_params_.quic_migrate_sessions_on_network_change; 435 http_network_session_params_.quic_migrate_sessions_on_network_change;
437 network_session_params.quic_user_agent_id = 436 network_session_params.quic_user_agent_id =
438 http_network_session_params_.quic_user_agent_id; 437 http_network_session_params_.quic_user_agent_id;
439 network_session_params.quic_prefer_aes = 438 network_session_params.quic_prefer_aes =
440 http_network_session_params_.quic_prefer_aes; 439 http_network_session_params_.quic_prefer_aes;
441 network_session_params.quic_migrate_sessions_early = 440 network_session_params.quic_migrate_sessions_early =
442 http_network_session_params_.quic_migrate_sessions_early; 441 http_network_session_params_.quic_migrate_sessions_early;
443 network_session_params.quic_disable_bidirectional_streams = 442 network_session_params.quic_disable_bidirectional_streams =
444 http_network_session_params_.quic_disable_bidirectional_streams; 443 http_network_session_params_.quic_disable_bidirectional_streams;
445 network_session_params.quic_race_cert_verification =
446 http_network_session_params_.quic_race_cert_verification;
447 if (proxy_delegate_) { 444 if (proxy_delegate_) {
448 network_session_params.proxy_delegate = proxy_delegate_.get(); 445 network_session_params.proxy_delegate = proxy_delegate_.get();
449 storage->set_proxy_delegate(std::move(proxy_delegate_)); 446 storage->set_proxy_delegate(std::move(proxy_delegate_));
450 } 447 }
451 if (socket_performance_watcher_factory_) { 448 if (socket_performance_watcher_factory_) {
452 network_session_params.socket_performance_watcher_factory = 449 network_session_params.socket_performance_watcher_factory =
453 socket_performance_watcher_factory_; 450 socket_performance_watcher_factory_;
454 } 451 }
455 452
456 storage->set_http_network_session( 453 storage->set_http_network_session(
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 } 519 }
523 url_request_interceptors_.clear(); 520 url_request_interceptors_.clear();
524 } 521 }
525 storage->set_job_factory(std::move(top_job_factory)); 522 storage->set_job_factory(std::move(top_job_factory));
526 // TODO(willchan): Support sdch. 523 // TODO(willchan): Support sdch.
527 524
528 return std::move(context); 525 return std::move(context);
529 } 526 }
530 527
531 } // namespace net 528 } // 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