Plumbing for TCP FastOpen for SSL sockets.

net/http/http_proxy_client_socket_pool_unittest.cc

Index: net/http/http_proxy_client_socket_pool_unittest.cc
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index f2464919e3a72e53a9a3c66a76db1490d50b98f5..a9acc8c0f9041226acff8b9d100c29b6a579fd54 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -117,10 +117,12 @@ class HttpProxyClientSocketPoolTest
   scoped_refptr<TransportSocketParams> CreateHttpProxyParams() const {
     if (GetParam().proxy_type != HTTP)
       return NULL;
-    return new TransportSocketParams(HostPortPair(kHttpProxyHost, 80),
-                                     false,
-                                     false,
-                                     OnHostResolutionCallback());
+    return new TransportSocketParams(
+        HostPortPair(kHttpProxyHost, 80),
+        false,
+        false,
+        OnHostResolutionCallback(),
+        TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT);
   }
 
   scoped_refptr<SSLSocketParams> CreateHttpsProxyParams() const {
@@ -131,7 +133,8 @@ class HttpProxyClientSocketPoolTest
             HostPortPair(kHttpsProxyHost, 443),
             false,
             false,
-            OnHostResolutionCallback()),
+            OnHostResolutionCallback(),
+            TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT),
         NULL,
         NULL,
         HostPortPair(kHttpsProxyHost, 443),