Reverting 6911.

base/message_loop.cc

Index: base/message_loop.cc
===================================================================
--- base/message_loop.cc	(revision 6915)
+++ base/message_loop.cc	(working copy)
@@ -593,17 +593,22 @@
 
 #elif defined(OS_POSIX)
 
-bool MessageLoopForIO::WatchFileDescriptor(int fd,
-                                           bool persistent,
-                                           Mode mode,
-                                           FileDescriptorWatcher *controller,
-                                           Watcher *delegate) {
-  return pump_libevent()->WatchFileDescriptor(
-      fd,
-      persistent,
-      static_cast<base::MessagePumpLibevent::Mode>(mode),
-      controller,
-      delegate);
+void MessageLoopForIO::WatchSocket(int socket, short interest_mask,
+                                   struct event* e, Watcher* watcher) {
+  pump_libevent()->WatchSocket(socket, interest_mask, e, watcher);
 }
 
+void MessageLoopForIO::WatchFileHandle(int fd, short interest_mask,
+                                       struct event* e, FileWatcher* watcher) {
+  pump_libevent()->WatchFileHandle(fd, interest_mask, e, watcher);
+}
+
+
+void MessageLoopForIO::UnwatchSocket(struct event* e) {
+  pump_libevent()->UnwatchSocket(e);
+}
+
+void MessageLoopForIO::UnwatchFileHandle(struct event* e) {
+  pump_libevent()->UnwatchFileHandle(e);
+}
 #endif