Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index 056d9f07c0b1a1530a7dc37ef4029f49e438e9c8..11e28fca9dd32c391a481bd50ab4099d3ed38bbe 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -1134,6 +1134,8 @@ void IOThread::ConfigureQuicGlobals( |
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); |
+ bool enable_alternative_services = |
+ command_line.HasSwitch(switches::kEnableAltSvc); |
if (enable_quic) { |
globals->enable_insecure_quic.set( |
ShouldEnableInsecureQuic(command_line, quic_trial_params)); |
@@ -1159,8 +1161,8 @@ void IOThread::ConfigureQuicGlobals( |
ShouldQuicDisableDiskCache(quic_trial_params)); |
globals->quic_prefer_aes.set( |
ShouldQuicPreferAes(quic_trial_params)); |
- globals->use_alternative_services.set( |
- ShouldQuicEnableAlternativeServices(quic_trial_params)); |
+ enable_alternative_services |= |
+ ShouldQuicEnableAlternativeServices(quic_trial_params); |
Ryan Hamilton
2015/09/08 17:50:06
Typically, we put the command line flag logic into
Bence
2015/09/14 21:56:16
Done.
|
int max_number_of_lossy_connections = GetQuicMaxNumberOfLossyConnections( |
quic_trial_params); |
if (max_number_of_lossy_connections != 0) { |
@@ -1175,6 +1177,7 @@ void IOThread::ConfigureQuicGlobals( |
globals->quic_connection_options = |
GetQuicConnectionOptions(command_line, quic_trial_params); |
} |
+ globals->use_alternative_services.set(enable_alternative_services); |
size_t max_packet_length = GetQuicMaxPacketLength(command_line, |
quic_trial_params); |