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 a3773f6a4b2883054b44c7867cec4e85909fa7f4..03f4b104063954016942357eb609b07156a8fdb7 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -853,8 +853,13 @@ 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 user_enabled_tfo = false;
+  if (command_line.HasSwitch(switches::kEnableTcpFastOpen)) {
+    user_enabled_tfo = true;
+  }
+  // Checks for OS support of TCP FastOpen, and turns it on for all connections
+  // if indicated by user above.
+  net::CheckSupportAndMaybeEnableTCPFastOpen(user_enabled_tfo);
 }
 
 void IOThread::ConfigureSpdyFromTrial(const std::string& spdy_trial_group,