Revert of net: merge two versions of SetTCPNoDelay() function into one

net/tools/flip_server/acceptor_thread.cc

Index: net/tools/flip_server/acceptor_thread.cc
diff --git a/net/tools/flip_server/acceptor_thread.cc b/net/tools/flip_server/acceptor_thread.cc
index 22b94f3e53e83a2d89320a4b627f007bccdaa445..9d2fcca53d149531ac6b964d5303896ed3357a55 100644
--- a/net/tools/flip_server/acceptor_thread.cc
+++ b/net/tools/flip_server/acceptor_thread.cc
@@ -12,11 +12,11 @@
 
 #include <string>
 
-#include "net/socket/tcp_socket.h"
 #include "net/tools/flip_server/constants.h"
 #include "net/tools/flip_server/flip_config.h"
 #include "net/tools/flip_server/sm_connection.h"
 #include "net/tools/flip_server/spdy_ssl.h"
+#include "net/tools/flip_server/tcp_socket_util.h"
 #include "openssl/err.h"
 #include "openssl/ssl.h"
 
@@ -83,7 +83,7 @@
 void SMAcceptorThread::HandleConnection(int server_fd,
                                         struct sockaddr_in* remote_addr) {
   if (acceptor_->disable_nagle_) {
-    if (!SetTCPNoDelay(server_fd, /*no_delay=*/true)) {
+    if (!SetTCPNoDelay(server_fd)) {
       close(server_fd);
       LOG(FATAL) << "SetTCPNoDelay() failed on fd: " << server_fd;
       return;