Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index 9ef53eeac4556f6865d2b244199b8d94a453161e..ad5d7ad8c140cf70957f55e440b55495787d6ba3 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -1030,6 +1030,7 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals( |
¶ms->alternate_protocol_probability_threshold); |
globals.enable_quic.CopyToIfSet(¶ms->enable_quic); |
+ globals.enable_quic_proxy.CopyToIfSet(¶ms->enable_quic_proxy); |
globals.quic_always_require_handshake_confirmation.CopyToIfSet( |
¶ms->quic_always_require_handshake_confirmation); |
globals.quic_disable_connection_pooling.CopyToIfSet( |
@@ -1150,6 +1151,9 @@ void IOThread::ConfigureQuicGlobals( |
IOThread::Globals* globals) { |
bool enable_quic = ShouldEnableQuic(command_line, quic_trial_group); |
globals->enable_quic.set(enable_quic); |
+ bool enable_quic_for_proxies = |
+ ShouldEnableQuicForProxies(command_line, quic_trial_group); |
+ globals->enable_quic_proxy.set(enable_quic_for_proxies); |
if (enable_quic) { |
globals->quic_always_require_handshake_confirmation.set( |
ShouldQuicAlwaysRequireHandshakeConfirmation(quic_trial_params)); |
@@ -1229,6 +1233,13 @@ bool IOThread::ShouldEnableQuic(const base::CommandLine& command_line, |
quic_trial_group.starts_with(kQuicFieldTrialHttpsEnabledGroupName); |
} |
+bool IOThread::ShouldEnableQuicForProxies(const base::CommandLine& command_line, |
+ base::StringPiece quic_trial_group) { |
+ return ShouldEnableQuic(command_line, quic_trial_group) || |
+ base::FieldTrialList::FindFullName( |
+ "DataReductionProxyUseQUICAsPrimaryOrigin") == "Enabled"; |
bengr
2015/02/07 01:48:48
How about DataReductionProxyUseQUIC?
And why does
Ryan Hamilton
2015/02/08 16:56:35
s/QUIC/Quic/ when used like this. Do you already h
Ryan Hamilton
2015/02/08 16:56:36
I think you need to check the --disable-quic flag?
tbansal1
2015/02/10 19:46:04
Done.
tbansal1
2015/02/10 19:46:04
Done.
tbansal1
2015/02/10 19:46:04
Done.
tbansal1
2015/02/10 19:46:04
Done.
tbansal1
2015/02/10 22:45:41
Done.
tbansal1
2015/02/10 22:45:41
This is the first.
|
+} |
+ |
bool IOThread::ShouldEnableQuicPortSelection( |
const base::CommandLine& command_line) { |
if (command_line.HasSwitch(switches::kDisableQuicPortSelection)) |