diff options
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 664a507..7726fcf 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -63,6 +63,7 @@ #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_script_fetcher_impl.h" #include "net/proxy/proxy_service.h" +#include "net/quic/crypto/crypto_protocol.h" #include "net/quic/quic_protocol.h" #include "net/socket/tcp_client_socket.h" #include "net/spdy/spdy_session.h" @@ -1043,8 +1044,6 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals( ¶ms->enable_websocket_over_spdy); globals.enable_quic.CopyToIfSet(¶ms->enable_quic); - globals.enable_quic_pacing.CopyToIfSet( - ¶ms->enable_quic_pacing); globals.enable_quic_time_based_loss_detection.CopyToIfSet( ¶ms->enable_quic_time_based_loss_detection); globals.enable_quic_port_selection.CopyToIfSet( @@ -1157,9 +1156,6 @@ void IOThread::ConfigureQuicGlobals( bool enable_quic = ShouldEnableQuic(command_line, quic_trial_group); globals->enable_quic.set(enable_quic); if (enable_quic) { - globals->enable_quic_pacing.set( - ShouldEnableQuicPacing(command_line, quic_trial_group, - quic_trial_params)); globals->enable_quic_time_based_loss_detection.set( ShouldEnableQuicTimeBasedLossDetection(command_line, quic_trial_group, quic_trial_params)); @@ -1167,6 +1163,10 @@ void IOThread::ConfigureQuicGlobals( ShouldEnableQuicPortSelection(command_line)); globals->quic_connection_options = GetQuicConnectionOptions(command_line, quic_trial_params); + if (ShouldEnableQuicPacing(command_line, quic_trial_group, + quic_trial_params)) { + globals->quic_connection_options.push_back(net::kPACE); + } } size_t max_packet_length = GetQuicMaxPacketLength(command_line, |