Revert "Revert 235213 "android: forwader2: Simplify Forwarder implementa...""

tools/android/forwarder2/socket.h

 // 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.
 
 #ifndef TOOLS_ANDROID_FORWARDER2_SOCKET_H_
 #define TOOLS_ANDROID_FORWARDER2_SOCKET_H_
 
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
@@ skipping 19 matching lines @@
   bool ConnectUnix(const std::string& path);
   bool ConnectTcp(const std::string& host, int port);
 
   // Just a wrapper around unix socket shutdown(), see man 2 shutdown.
   void Shutdown();
 
   // Just a wrapper around unix socket close(), see man 2 close.
   void Close();
   bool IsClosed() const { return socket_ < 0; }
 
+  int fd() const { return socket_; }
+
   bool Accept(Socket* new_socket);
 
   // Returns the port allocated to this socket or zero on error.
   int GetPort();
 
-  bool IsFdInSet(const fd_set& fds) const;
-  bool AddFdToSet(fd_set* fds) const;
-
   // Just a wrapper around unix read() function.
   // Reads up to buffer_size, but may read less then buffer_size.
   // Returns the number of bytes read.
   int Read(void* buffer, size_t buffer_size);
 
   // Non-blocking version of Read() above. This must be called after a
   // successful call to select(). The socket must also be in non-blocking mode
   // before calling this method.
   int NonBlockingRead(void* buffer, size_t buffer_size);
 
@@ skipping 24 matching lines @@
   // PipeNotifier and must live (not be closed) at least as long as this socket
   // is alive.
   void AddEventFd(int event_fd);
 
   // Returns whether Accept() or Connect() was interrupted because the socket
   // received an external event fired through the provided fd.
   bool DidReceiveEventOnFd(int fd) const;
 
   bool DidReceiveEvent() const;
 
-  static int GetHighestFileDescriptor(const Socket& s1, const Socket& s2);
-
   static pid_t GetUnixDomainSocketProcessOwner(const std::string& path);
 
  private:
   enum EventType {
     READ,
     WRITE
   };
 
   union SockAddr {
     // IPv4 sockaddr
@@ skipping 42 matching lines @@
   // Used to listen for external events (e.g. process received a SIGTERM) while
   // blocking on I/O operations.
   std::vector<Event> events_;
 
   DISALLOW_COPY_AND_ASSIGN(Socket);
 };
 
 }  // namespace forwarder
 
 #endif  // TOOLS_ANDROID_FORWARDER2_SOCKET_H_