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

tools/android/forwarder2/socket.cc

Index: tools/android/forwarder2/socket.cc
diff --git a/tools/android/forwarder2/socket.cc b/tools/android/forwarder2/socket.cc
index d6a47371b4c14ea1105d26d92e93e23f1503abe7..fb0b48fd6810ba1de267a76bd79b19a611b3e837 100644
--- a/tools/android/forwarder2/socket.cc
+++ b/tools/android/forwarder2/socket.cc
@@ -287,19 +287,6 @@ int Socket::GetPort() {
   return port_;
 }
 
-bool Socket::IsFdInSet(const fd_set& fds) const {
-  if (IsClosed())
-    return false;
-  return FD_ISSET(socket_, &fds);
-}
-
-bool Socket::AddFdToSet(fd_set* fds) const {
-  if (IsClosed())
-    return false;
-  FD_SET(socket_, fds);
-  return true;
-}
-
 int Socket::ReadNumBytes(void* buffer, size_t num_bytes) {
   int bytes_read = 0;
   int ret = 1;
@@ -442,11 +429,6 @@ bool Socket::WaitForEvent(EventType type, int timeout_secs) {
 }
 
 // static
-int Socket::GetHighestFileDescriptor(const Socket& s1, const Socket& s2) {
-  return std::max(s1.socket_, s2.socket_);
-}
-
-// static
 pid_t Socket::GetUnixDomainSocketProcessOwner(const std::string& path) {
   Socket socket;
   if (!socket.ConnectUnix(path))