POSIX only: Move client socket functionality from TCPClientSocket into TCPSocket.

net/socket/tcp_client_socket.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_SOCKET_TCP_CLIENT_SOCKET_H_
 #define NET_SOCKET_TCP_CLIENT_SOCKET_H_
 
-#include "build/build_config.h"
-#include "net/base/net_export.h"
-
-// TODO(yzshen): Switch OS_POSIX to use the same platform-independent
-// TCPClientSocket.
-#if defined(OS_WIN)
-
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
+#include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/socket/stream_socket.h"
 #include "net/socket/tcp_socket.h"
 
-#elif defined(OS_POSIX)
-#include "net/socket/tcp_client_socket_libevent.h"
-#endif
-
 namespace net {
 
-// Enable/disable experimental TCP FastOpen option.
-// Not thread safe.  Must be called during initialization/startup only.
-NET_EXPORT void SetTCPFastOpenEnabled(bool value);
-
-// Check if the TCP FastOpen option is enabled.
-bool IsTCPFastOpenEnabled();
-
 // A client socket that uses TCP as the transport layer.
-#if defined(OS_POSIX)
-typedef TCPClientSocketLibevent TCPClientSocket;
-#elif defined(OS_WIN)
-
 class NET_EXPORT TCPClientSocket : public StreamSocket {
  public:
   // The IP address(es) and port number to connect to.  The TCP socket will try
   // each IP address in the list until it succeeds in establishing a
   // connection.
   TCPClientSocket(const AddressList& addresses,
                   net::NetLog* net_log,
                   const net::NetLog::Source& source);
 
   // Adopts the given, connected socket. This object takes ownership of the
   // given socket and then acts as if Connect() had been called. This function
   // is used by TCPServerSocket to adopt accepted connections and for testing.
   explicit TCPClientSocket(scoped_ptr<TCPSocket> connected_socket,
                            const IPEndPoint& peer_address);
 
   virtual ~TCPClientSocket();
 
   // Binds the socket to a local IP address and port.
   int Bind(const IPEndPoint& address);
 
   // StreamSocket implementation.
-  virtual int Connect(const CompletionCallback& callback);
-  virtual void Disconnect();
-  virtual bool IsConnected() const;
-  virtual bool IsConnectedAndIdle() const;
-  virtual int GetPeerAddress(IPEndPoint* address) const;
-  virtual int GetLocalAddress(IPEndPoint* address) const;
-  virtual const BoundNetLog& NetLog() const { return socket_->net_log(); }
-  virtual void SetSubresourceSpeculation();
-  virtual void SetOmniboxSpeculation();
-  virtual bool WasEverUsed() const;
-  virtual bool UsingTCPFastOpen() const;
+  virtual int Connect(const CompletionCallback& callback) OVERRIDE;
+  virtual void Disconnect() OVERRIDE;
+  virtual bool IsConnected() const OVERRIDE;
+  virtual bool IsConnectedAndIdle() const OVERRIDE;
+  virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
+  virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
+  virtual const BoundNetLog& NetLog() const OVERRIDE;
+  virtual void SetSubresourceSpeculation() OVERRIDE;
+  virtual void SetOmniboxSpeculation() OVERRIDE;
+  virtual bool WasEverUsed() const OVERRIDE;
+  virtual bool UsingTCPFastOpen() const OVERRIDE;
   virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
   // Socket implementation.
   // Multiple outstanding requests are not supported.
   // Full duplex mode (reading and writing at the same time) is supported
   virtual int Read(IOBuffer* buf, int buf_len,
                    const CompletionCallback& callback) OVERRIDE;
   virtual int Write(IOBuffer* buf, int buf_len,
@@ skipping 48 matching lines @@
   // This socket was previously disconnected and has not been re-connected.
   bool previously_disconnected_;
 
   // Record of connectivity and transmissions, for use in speculative connection
   // histograms.
   UseHistory use_history_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPClientSocket);
 };
 
-#endif
-
 }  // namespace net
 
 #endif  // NET_SOCKET_TCP_CLIENT_SOCKET_H_