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

tools/android/forwarder2/socket.h

Index: tools/android/forwarder2/socket.h
diff --git a/tools/android/forwarder2/socket.h b/tools/android/forwarder2/socket.h
index 33d72fcfedc030eb3fdf13a53918072e8c7704dd..6047a1c3ec77539143377c947391028a2763f716 100644
--- a/tools/android/forwarder2/socket.h
+++ b/tools/android/forwarder2/socket.h
@@ -37,14 +37,13 @@ class Socket {
   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.
@@ -89,8 +88,6 @@ class Socket {
 
   bool DidReceiveEvent() const;
 
-  static int GetHighestFileDescriptor(const Socket& s1, const Socket& s2);
-
   static pid_t GetUnixDomainSocketProcessOwner(const std::string& path);
 
  private: