| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index 4a012e171cfd9e231b53e4db8fb626f5253afc51..0de54ea70fbfc92850374818d72cc22f8e570549 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -1144,6 +1144,8 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals(
|
| globals.enable_brotli.CopyToIfSet(¶ms->enable_brotli);
|
|
|
| globals.enable_quic.CopyToIfSet(¶ms->enable_quic);
|
| + globals.disable_quic_on_timeout_with_open_streams.CopyToIfSet(
|
| + ¶ms->disable_quic_on_timeout_with_open_streams);
|
| globals.enable_quic_for_proxies.CopyToIfSet(¶ms->enable_quic_for_proxies);
|
| globals.quic_always_require_handshake_confirmation.CopyToIfSet(
|
| ¶ms->quic_always_require_handshake_confirmation);
|
| @@ -1268,6 +1270,8 @@ void IOThread::ConfigureQuicGlobals(
|
| bool enable_quic = ShouldEnableQuic(command_line, quic_trial_group,
|
| quic_allowed_by_policy);
|
| globals->enable_quic.set(enable_quic);
|
| + globals->disable_quic_on_timeout_with_open_streams.set(
|
| + ShouldDisableQuicWhenConnectionTimesOutWithOpenStreams(quic_trial_params));
|
| bool enable_quic_for_proxies = ShouldEnableQuicForProxies(
|
| command_line, quic_trial_group, quic_allowed_by_policy);
|
| globals->enable_quic_for_proxies.set(enable_quic_for_proxies);
|
| @@ -1366,6 +1370,14 @@ void IOThread::ConfigureQuicGlobals(
|
| }
|
| }
|
|
|
| +bool IOThread::ShouldDisableQuicWhenConnectionTimesOutWithOpenStreams(
|
| + const VariationParameters& quic_trial_params) {
|
| + return base::LowerCaseEqualsASCII(
|
| + GetVariationParam(quic_trial_params,
|
| + "disable_quic_on_timeout_with_open_streams"),
|
| + "true");
|
| +}
|
| +
|
| bool IOThread::ShouldEnableQuic(const base::CommandLine& command_line,
|
| base::StringPiece quic_trial_group,
|
| bool quic_allowed_by_policy) {
|
|
|