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

Side by Side Diff: net/http/http_network_session.cc

Issue 1862193002: Enable QUIC for proxies only when QUIC is enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed sclittle comments Created 4 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 unified diff | Download patch
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/http/http_network_session.h" 5 #include "net/http/http_network_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 enable_http2(true), 95 enable_http2(true),
96 spdy_session_max_recv_window_size(kSpdySessionMaxRecvWindowSize), 96 spdy_session_max_recv_window_size(kSpdySessionMaxRecvWindowSize),
97 spdy_stream_max_recv_window_size(kSpdyStreamMaxRecvWindowSize), 97 spdy_stream_max_recv_window_size(kSpdyStreamMaxRecvWindowSize),
98 time_func(&base::TimeTicks::Now), 98 time_func(&base::TimeTicks::Now),
99 parse_alternative_services(true), 99 parse_alternative_services(true),
100 enable_alternative_service_with_different_host(false), 100 enable_alternative_service_with_different_host(false),
101 enable_npn(false), 101 enable_npn(false),
102 enable_priority_dependencies(true), 102 enable_priority_dependencies(true),
103 enable_quic(false), 103 enable_quic(false),
104 disable_quic_on_timeout_with_open_streams(false), 104 disable_quic_on_timeout_with_open_streams(false),
105 enable_quic_for_proxies(false),
106 enable_quic_port_selection(true), 105 enable_quic_port_selection(true),
107 quic_always_require_handshake_confirmation(false), 106 quic_always_require_handshake_confirmation(false),
108 quic_disable_connection_pooling(false), 107 quic_disable_connection_pooling(false),
109 quic_load_server_info_timeout_srtt_multiplier(0.25f), 108 quic_load_server_info_timeout_srtt_multiplier(0.25f),
110 quic_enable_connection_racing(false), 109 quic_enable_connection_racing(false),
111 quic_enable_non_blocking_io(false), 110 quic_enable_non_blocking_io(false),
112 quic_disable_disk_cache(false), 111 quic_disable_disk_cache(false),
113 quic_prefer_aes(false), 112 quic_prefer_aes(false),
114 quic_max_number_of_lossy_connections(0), 113 quic_max_number_of_lossy_connections(0),
115 quic_packet_loss_threshold(1.0f), 114 quic_packet_loss_threshold(1.0f),
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 298
300 std::unique_ptr<base::Value> HttpNetworkSession::SpdySessionPoolInfoToValue() 299 std::unique_ptr<base::Value> HttpNetworkSession::SpdySessionPoolInfoToValue()
301 const { 300 const {
302 return spdy_session_pool_.SpdySessionPoolInfoToValue(); 301 return spdy_session_pool_.SpdySessionPoolInfoToValue();
303 } 302 }
304 303
305 std::unique_ptr<base::Value> HttpNetworkSession::QuicInfoToValue() const { 304 std::unique_ptr<base::Value> HttpNetworkSession::QuicInfoToValue() const {
306 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); 305 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
307 dict->Set("sessions", quic_stream_factory_.QuicStreamFactoryInfoToValue()); 306 dict->Set("sessions", quic_stream_factory_.QuicStreamFactoryInfoToValue());
308 dict->SetBoolean("quic_enabled", params_.enable_quic); 307 dict->SetBoolean("quic_enabled", params_.enable_quic);
309 dict->SetBoolean("quic_enabled_for_proxies", params_.enable_quic_for_proxies);
310 dict->SetBoolean("enable_quic_port_selection", 308 dict->SetBoolean("enable_quic_port_selection",
311 params_.enable_quic_port_selection); 309 params_.enable_quic_port_selection);
312 std::unique_ptr<base::ListValue> connection_options(new base::ListValue); 310 std::unique_ptr<base::ListValue> connection_options(new base::ListValue);
313 for (QuicTagVector::const_iterator it = 311 for (QuicTagVector::const_iterator it =
314 params_.quic_connection_options.begin(); 312 params_.quic_connection_options.begin();
315 it != params_.quic_connection_options.end(); ++it) { 313 it != params_.quic_connection_options.end(); ++it) {
316 connection_options->AppendString("'" + QuicUtils::TagToString(*it) + "'"); 314 connection_options->AppendString("'" + QuicUtils::TagToString(*it) + "'");
317 } 315 }
318 dict->Set("connection_options", std::move(connection_options)); 316 dict->Set("connection_options", std::move(connection_options));
319 317
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 case WEBSOCKET_SOCKET_POOL: 402 case WEBSOCKET_SOCKET_POOL:
405 return websocket_socket_pool_manager_.get(); 403 return websocket_socket_pool_manager_.get();
406 default: 404 default:
407 NOTREACHED(); 405 NOTREACHED();
408 break; 406 break;
409 } 407 }
410 return NULL; 408 return NULL;
411 } 409 }
412 410
413 } // namespace net 411 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698