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

tools/android/forwarder2/socket.cc

 // 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.
 
 #include "tools/android/forwarder2/socket.h"
 
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ skipping 269 matching lines @@
 }
 
 int Socket::GetPort() {
   if (!FamilyIsTCP(family_)) {
     LOG(ERROR) << "Can't call GetPort() on an unix domain socket.";
     return 0;
   }
   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;
   while (bytes_read < num_bytes && ret > 0) {
     ret = Read(static_cast<char*>(buffer) + bytes_read, num_bytes - bytes_read);
     if (ret >= 0)
       bytes_read += ret;
   }
   return bytes_read;
 }
@@ skipping 122 matching lines @@
   for (size_t i = 0; i < events_.size(); ++i) {
     if (FD_ISSET(events_[i].fd, &read_fds)) {
       events_[i].was_fired = true;
       event_was_fired = true;
     }
   }
   return !event_was_fired;
 }
 
 // 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))
     return -1;
   ucred ucred;
   socklen_t len = sizeof(ucred);
   if (getsockopt(socket.socket_, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == -1) {
     CHECK_NE(ENOPROTOOPT, errno);
     return -1;
   }
   return ucred.pid;
 }
 
 }  // namespace forwarder2