Reverting 6911.

Review URL: http://codereview.chromium.org/14068

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

1 files changed, 16 insertions, 11 deletions

diff --git a/base/message_loop.cc b/base/message_loop.cc
index 12ad3fa..898fbfa 100644
--- a/base/message_loop.cc
+++ b/base/message_loop.cc
@@ -593,17 +593,22 @@ bool MessageLoopForIO::WaitForIOCompletion(DWORD timeout, IOHandler* filter) {
 
 #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