Reverting 6911.

net/base/tcp_client_socket.h

Index: net/base/tcp_client_socket.h
===================================================================
--- net/base/tcp_client_socket.h	(revision 6915)
+++ net/base/tcp_client_socket.h	(working copy)
@@ -14,7 +14,7 @@
 struct event;  // From libevent
 #include <sys/socket.h>  // for struct sockaddr
 #define SOCKET int
-#include "base/message_loop.h"
+#include "base/message_pump_libevent.h"
 #endif
 
 #include "base/scoped_ptr.h"
@@ -26,7 +26,7 @@
 
 // A client socket that uses TCP as the transport layer.
 //
-// NOTE: The windows implementation supports half duplex only.
+// NOTE: The windows implementation supports half duplex only.  
 // Read and Write calls must not be in progress at the same time.
 // The libevent implementation supports full duplex because that
 // made it slightly easier to implement ssl.
@@ -34,7 +34,7 @@
 #if defined(OS_WIN)
                         public base::ObjectWatcher::Delegate
 #elif defined(OS_POSIX)
-                        public MessageLoopForIO::Watcher
+                        public base::MessagePumpLibevent::Watcher
 #endif
 {
  public:
@@ -52,7 +52,7 @@
   virtual bool IsConnected() const;
 
   // Socket methods:
-  // Multiple outstanding requests are not supported.
+  // Multiple outstanding requests are not supported.  
   // Full duplex mode (reading and writing at the same time) is not supported
   // on Windows (but is supported on Linux and Mac for ease of implementation
   // of SSLClientSocket)
@@ -97,11 +97,10 @@
   bool waiting_connect_;
 
   // The socket's libevent wrapper
-  MessageLoopForIO::FileDescriptorWatcher socket_watcher_;
+  scoped_ptr<event> event_;
 
   // Called by MessagePumpLibevent when the socket is ready to do I/O
-  void OnFileCanReadWithoutBlocking(int fd);
-  void OnFileCanWriteWithoutBlocking(int fd);
+  void OnSocketReady(short flags);
 
   // The buffer used by OnSocketReady to retry Read requests
   char* buf_;