Plumbing for TCP FastOpen for SSL sockets.

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index eb60017609aa0907f8d06f4fd7bdecd60b491a83..f0b3e6d2b62023652303f2d068e1f65c8cbe5abb 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -847,8 +847,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.
-  if (command_line.HasSwitch(switches::kEnableTcpFastOpen))
-    net::SetTCPFastOpenEnabled(true);
+
+  bool always_enable_if_supported =
+    command_line.HasSwitch(switches::kEnableTcpFastOpen);
+  // Check for OS support of TCP FastOpen, and turn it on for all connections
+  // if indicated by user.
+  net::CheckSupportAndMaybeEnableTCPFastOpen(always_enable_if_supported);
 }
 
 void IOThread::ConfigureSpdyFromTrial(const std::string& spdy_trial_group,