Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index 595c01b03d5777bca0797ecce8051c57e56ba4fc..da88413522ee648be814e43454175de299d21cd5 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -843,8 +843,12 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) { |
// instance, constructed from a NetworkSession::Params, to allow us |
// to move this option to IOThread::Globals & |
// HttpNetworkSession::Params. |
+ bool always_enable_if_supported = false; |
if (command_line.HasSwitch(switches::kEnableTcpFastOpen)) |
- net::SetTCPFastOpenEnabled(true); |
+ always_enable_if_supported = true; |
mmenke
2014/09/09 14:29:28
optional nit: Could just merge these into one sta
Jana
2014/09/10 16:03:11
I had just done exactly this nit fixing, so done :
|
+ // Checks for OS support of TCP FastOpen, and turns it on for all connections |
+ // if indicated by user above. |
+ net::CheckSupportAndMaybeEnableTCPFastOpen(always_enable_if_supported); |
} |
void IOThread::ConfigureSpdyFromTrial(const std::string& spdy_trial_group, |