Reverting 6911.

base/message_loop.h

Index: base/message_loop.h
===================================================================
--- base/message_loop.h	(revision 6915)
+++ base/message_loop.h	(working copy)
@@ -473,21 +473,14 @@
 
 #elif defined(OS_POSIX)
   typedef base::MessagePumpLibevent::Watcher Watcher;
-  typedef base::MessagePumpLibevent::FileDescriptorWatcher
-      FileDescriptorWatcher;
+  typedef base::MessagePumpLibevent::FileWatcher FileWatcher;
 
-  enum Mode {
-    WATCH_READ = base::MessagePumpLibevent::WATCH_READ,
-    WATCH_WRITE = base::MessagePumpLibevent::WATCH_WRITE,
-    WATCH_READ_WRITE = base::MessagePumpLibevent::WATCH_READ_WRITE
-  };
-
-  // Please see MessagePumpLibevent for definition.
-  bool WatchFileDescriptor(int fd,
-                           bool persistent,
-                           Mode mode,
-                           FileDescriptorWatcher *controller,
-                           Watcher *delegate);
+  // Please see MessagePumpLibevent for definitions of these methods.
+  void WatchSocket(int socket, short interest_mask,
+                   struct event* e, Watcher* watcher);
+  void WatchFileHandle(int fd, short interest_mask, event* e, FileWatcher*);
+  void UnwatchSocket(struct event* e);
+  void UnwatchFileHandle(event* e);
 #endif  // defined(OS_POSIX)
 };