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

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

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