Revert 72421 (broke tests) - Enable TCP Keep-Alive packets for Windows....

net/socket/tcp_client_socket_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/tcp_client_socket_win.h"
 
-#include <mstcpip.h>
-
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory_debug.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/win/object_watcher.h"
 #include "net/base/address_list_net_log_param.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/io_buffer.h"
@@ skipping 707 matching lines @@
   //     Client writes 50 bytes of POST data (partial packet #2)
   // In the above example, with Nagle, a RTT delay is inserted between these
   // two sends due to nagle.  RTTs can easily be 100ms or more.  The best
   // fix is to make sure that for POSTing data, we write as much data as
   // possible and minimize partial packets.  We will fix that.  But disabling
   // Nagle also ensure we don't run into this delay in other edge cases.
   // See also:
   //    http://technet.microsoft.com/en-us/library/bb726981.aspx
   const BOOL kDisableNagle = TRUE;
   int rv = setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY,
-                      reinterpret_cast<const char*>(&kDisableNagle),
-                      sizeof(kDisableNagle));
+      reinterpret_cast<const char*>(&kDisableNagle), sizeof(kDisableNagle));
   DCHECK(!rv) << "Could not disable nagle";
 
-  // Enable TCP Keep-Alive to prevent NAT routers from timing out TCP
-  // connections. See http://crbug.com/27400 for details.
-
-  struct tcp_keepalive keepalive_vals = {
-    1, // TCP keep-alive on.
-    45000,  // Wait 45s until sending first TCP keep-alive packet.
-    45000,  // Wait 45s between sending TCP keep-alive packets.
-  };
-  DWORD bytes_returned = 0xABAB;
-  rv = WSAIoctl(socket_, SIO_KEEPALIVE_VALS, &keepalive_vals,
-                sizeof(keepalive_vals), NULL, 0,
-                &bytes_returned, NULL, NULL);
-  DCHECK_EQ(0u, bytes_returned);
-  DCHECK(!rv) << "Could not enable TCP Keep-Alive for socket: " << socket_
-              << " [error: " << WSAGetLastError() << "].";
-
-  // Disregard any failure in disabling nagle or enabling TCP Keep-Alive.
+  // Disregard any failure in disabling nagle.
   return 0;
 }
 
 void TCPClientSocketWin::LogConnectCompletion(int net_error) {
   scoped_refptr<NetLog::EventParameters> params;
   if (net_error != OK)
     params = new NetLogIntegerParameter("net_error", net_error);
   net_log_.EndEvent(NetLog::TYPE_TCP_CONNECT, params);
   if (net_error == OK)
     UpdateConnectionTypeHistograms(CONNECTION_ANY);
@@ skipping 93 matching lines @@
         use_history_.set_was_used_to_convey_data();
       LogByteTransfer(net_log_, NetLog::TYPE_SOCKET_BYTES_SENT, num_bytes,
                       core_->write_buffer_.buf);
     }
   }
   core_->write_iobuffer_ = NULL;
   DoWriteCallback(rv);
 }
 
 }  // namespace net