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

> android: forwader2: Simplify Forwarder implementation.
> 
> This patch does several things to the Forwarder class used in the 'forwarder2'
> tool:
> 
> - Add a Stop() method to gently ask the forwarder to shut-down. This stops
>   the forwarder from listening from incoming data, but keeps it running
>   until it could flush its buffer properly, to avoid packet loss.
> 
> - Simplify / refactor the buffer management code inside a Forwarder
>   instance, to make the state of its buffer, and their transitions,
>   more explict.
> 
> BUG=313809
> R=pliard@chromium.org
> 
> Review URL: https://codereview.chromium.org/61793013

TBR=digit@chromium.org

Review URL: https://codereview.chromium.org/70193013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235729 0039d316-1c4b-4281-b951-d872f2087c98

tools/android/forwarder2/forwarder.h

@@ -6,6 +6,7 @@
 #define TOOLS_ANDROID_FORWARDER2_FORWARDER_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "base/threading/thread.h"
 
 namespace forwarder2 {
 

tools/android/forwarder2/socket.cc

@@ -287,6 +287,19 @@ 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;
@@ -428,6 +441,11 @@ bool Socket::WaitForEvent(EventType type, int timeout_secs) {
   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;

tools/android/forwarder2/socket.h

@@ -37,13 +37,14 @@ 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.
@@ -88,6 +89,8 @@ class Socket {
 
   bool DidReceiveEvent() const;
 
+  static int GetHighestFileDescriptor(const Socket& s1, const Socket& s2);
+
   static pid_t GetUnixDomainSocketProcessOwner(const std::string& path);
 
  private: