Index: net/http/http_network_session.cc |
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc |
index b48d660dc74ebea664cb50a794d397ad4e5cbfd1..cebbb1d4b7c0dda72efc3dd71043d7647da9b4bd 100644 |
--- a/net/http/http_network_session.cc |
+++ b/net/http/http_network_session.cc |
@@ -20,6 +20,7 @@ |
#include "net/quic/crypto/quic_random.h" |
#include "net/quic/quic_clock.h" |
#include "net/quic/quic_crypto_client_stream_factory.h" |
+#include "net/quic/quic_protocol.h" |
#include "net/quic/quic_stream_factory.h" |
#include "net/socket/client_socket_factory.h" |
#include "net/socket/client_socket_pool_manager_impl.h" |
@@ -87,7 +88,6 @@ HttpNetworkSession::Params::Params() |
enable_websocket_over_spdy(false), |
enable_quic(false), |
enable_quic_port_selection(true), |
- enable_quic_pacing(false), |
enable_quic_time_based_loss_detection(false), |
quic_clock(NULL), |
quic_random(NULL), |
@@ -129,7 +129,6 @@ HttpNetworkSession::HttpNetworkSession(const Params& params) |
params.quic_user_agent_id, |
params.quic_supported_versions, |
params.enable_quic_port_selection, |
- params.enable_quic_pacing, |
params.enable_quic_time_based_loss_detection, |
params.quic_connection_options), |
spdy_session_pool_(params.host_resolver, |
@@ -252,7 +251,7 @@ base::Value* HttpNetworkSession::QuicInfoToValue() const { |
dict->SetBoolean("enable_quic_port_selection", |
params_.enable_quic_port_selection); |
dict->SetBoolean("enable_quic_pacing", |
- params_.enable_quic_pacing); |
+ ContainsQuicTag(params_.quic_connection_options, kPACE)); |
Ryan Hamilton
2014/08/13 16:33:40
Consider removing "enable_quic_pacing" and replaci
ramant (doing other things)
2014/08/14 02:45:48
Fixed it in CL: https://chromiumcodereview.appspot
|
dict->SetBoolean("enable_quic_time_based_loss_detection", |
params_.enable_quic_time_based_loss_detection); |
dict->SetString("origin_to_force_quic_on", |