| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index a29e9d13ea3b77a4475709e2aacbddb768afdc76..e9b9e5984296d9d2c5116c490ec7d6304d2b8497 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -1182,6 +1182,7 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals(
|
| ¶ms->alternative_service_probability_threshold);
|
|
|
| globals.enable_quic.CopyToIfSet(¶ms->enable_quic);
|
| + globals.disable_insecure_quic.CopyToIfSet(¶ms->disable_insecure_quic);
|
| globals.enable_quic_for_proxies.CopyToIfSet(¶ms->enable_quic_for_proxies);
|
| globals.quic_always_require_handshake_confirmation.CopyToIfSet(
|
| ¶ms->quic_always_require_handshake_confirmation);
|
| @@ -1318,6 +1319,8 @@ void IOThread::ConfigureQuicGlobals(
|
| command_line, quic_trial_group, quic_allowed_by_policy);
|
| globals->enable_quic_for_proxies.set(enable_quic_for_proxies);
|
| if (enable_quic) {
|
| + globals->disable_insecure_quic.set(
|
| + ShouldDisableInsecureQuic(quic_trial_params));
|
| globals->quic_always_require_handshake_confirmation.set(
|
| ShouldQuicAlwaysRequireHandshakeConfirmation(quic_trial_params));
|
| globals->quic_disable_connection_pooling.set(
|
| @@ -1429,6 +1432,14 @@ bool IOThread::ShouldEnableQuicForDataReductionProxy() {
|
| IsIncludedInQuicFieldTrial();
|
| }
|
|
|
| +// static
|
| +bool IOThread::ShouldDisableInsecureQuic(
|
| + const VariationParameters& quic_trial_params) {
|
| + return LowerCaseEqualsASCII(
|
| + GetVariationParam(quic_trial_params, "disable_insecure_quic"),
|
| + "true");
|
| +}
|
| +
|
| bool IOThread::ShouldEnableQuicPortSelection(
|
| const base::CommandLine& command_line) {
|
| if (command_line.HasSwitch(switches::kDisableQuicPortSelection))
|
|
|