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

net/tools/flip_server/acceptor_thread.cc

 // Copyright (c) 2012 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/tools/flip_server/acceptor_thread.h"
 
 #include <errno.h>
 #include <netinet/in.h>
 #include <string.h>       // For strerror
 #include <sys/socket.h>
 #include <sys/types.h>
 
 #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"
 
 namespace net {
 
 SMAcceptorThread::SMAcceptorThread(FlipAcceptor* acceptor,
                                    MemoryCache* memory_cache)
     : SimpleThread("SMAcceptorThread"),
       acceptor_(acceptor),
       ssl_state_(NULL),
@@ skipping 46 matching lines @@
   return server;
 }
 
 void SMAcceptorThread::InitWorker() {
   epoll_server_.RegisterFD(acceptor_->listen_fd_, this, EPOLLIN | EPOLLET);
 }
 
 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;
     }
   }
 
   SMConnection* server_connection = FindOrMakeNewSMConnection();
   if (server_connection == NULL) {
     VLOG(1) << ACCEPTOR_CLIENT_IDENT << "Acceptor: Closing fd " << server_fd;
     close(server_fd);
@@ skipping 100 matching lines @@
     AcceptFromListenFD();
   }
 }
 
 void SMAcceptorThread::SMConnectionDone(SMConnection* sc) {
   VLOG(1) << ACCEPTOR_CLIENT_IDENT << "Done with connection.";
   tmp_unused_server_connections_.push_back(sc);
 }
 
 }  // namespace net