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

net/net.gypi

 # Copyright 2014 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.
 
 # This file is shared between the regular GYP build, the NaCl GYP build, and
 # the GN build. For GN support, it must have no conditionals or anything like
 # that beyond the simple one-level-deep dictionary of values.
 {
   'variables': {
     # Subset of net source files that are compiled for NaCl (net_nacl target).
@@ skipping 1067 matching lines @@
       'socket/ssl_server_socket_nss.cc',
       'socket/ssl_server_socket_nss.h',
       'socket/ssl_server_socket_openssl.cc',
       'socket/ssl_server_socket_openssl.h',
       'socket/stream_socket.cc',
       'socket/stream_socket.h',
       'socket/tcp_client_socket.cc',
       'socket/tcp_client_socket.h',
       'socket/tcp_server_socket.cc',
       'socket/tcp_server_socket.h',
+      'socket/tcp_socket.cc',
       'socket/tcp_socket.h',
       'socket/tcp_socket_posix.cc',
       'socket/tcp_socket_posix.h',
       'socket/tcp_socket_win.cc',
       'socket/tcp_socket_win.h',
       'socket/transport_client_socket_pool.cc',
       'socket/transport_client_socket_pool.h',
       'socket/unix_domain_client_socket_posix.cc',
       'socket/unix_domain_client_socket_posix.h',
       'socket/unix_domain_server_socket_posix.cc',
@@ skipping 892 matching lines @@
       'docs/bug-triage-labels.md',
       'docs/bug-triage-suggested-workflow.md',
       'docs/code-patterns.md',
       'docs/crash-course-in-net-internals.md',
       'docs/life-of-a-url-request.md',
       'sdch/README.md',
     ],
     'net_docs_output_dir': '<(PRODUCT_DIR)/net/docs',
   }
 }