Mass rename MessageLoopForIO types to MessagePumpForIO

As promised @ https://chromium-review.googlesource.com/c/chromium/src/+/999795

Scripted via https://crbug.com/825327#c18

Also cleaning up MessageLoop/MessagePump APIs from now unused types.

TBR=fdoray@chromium.org

Bug: 825327
Change-Id: I9b458bc24223e57afb3e8a08678f97b2cd8330da
Reviewed-on: https://chromium-review.googlesource.com/1003080
Commit-Queue: Gabriel Charette <gab@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549518}

CrOS-Libchrome-Original-Commit: 19d2ae606fa00525a93e4901ae0870f9f7b1fd2d

1 files changed, 21 insertions, 15 deletions

diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc
index 41cb4f499a..b417f2fffe 100644
--- a/base/message_loop/message_loop.cc
+++ b/base/message_loop/message_loop.cc
@@ -500,8 +500,8 @@ bool MessageLoopForUI::WatchFileDescriptor(
     int fd,
     bool persistent,
     MessagePumpLibevent::Mode mode,
-    MessagePumpLibevent::FileDescriptorWatcher* controller,
-    MessagePumpLibevent::Watcher* delegate) {
+    MessagePumpLibevent::FdWatchController* controller,
+    MessagePumpLibevent::FdWatcher* delegate) {
   return static_cast<MessagePumpForUI*>(pump_.get())
       ->WatchFileDescriptor(fd, persistent, mode, controller, delegate);
 }
@@ -523,23 +523,28 @@ MessagePumpForIO* ToPumpIO(MessagePump* pump) {
 }  // namespace
 
 #if defined(OS_WIN)
-void MessageLoopForIO::RegisterIOHandler(HANDLE file, IOHandler* handler) {
+void MessageLoopForIO::RegisterIOHandler(HANDLE file,
+                                         MessagePumpForIO::IOHandler* handler) {
   ToPumpIO(pump_.get())->RegisterIOHandler(file, handler);
 }
 
-bool MessageLoopForIO::RegisterJobObject(HANDLE job, IOHandler* handler) {
+bool MessageLoopForIO::RegisterJobObject(HANDLE job,
+                                         MessagePumpForIO::IOHandler* handler) {
   return ToPumpIO(pump_.get())->RegisterJobObject(job, handler);
 }
 
-bool MessageLoopForIO::WaitForIOCompletion(DWORD timeout, IOHandler* filter) {
+bool MessageLoopForIO::WaitForIOCompletion(
+    DWORD timeout,
+    MessagePumpForIO::IOHandler* filter) {
   return ToPumpIO(pump_.get())->WaitForIOCompletion(timeout, filter);
 }
 #elif defined(OS_POSIX)
-bool MessageLoopForIO::WatchFileDescriptor(int fd,
-                                           bool persistent,
-                                           Mode mode,
-                                           FileDescriptorWatcher* controller,
-                                           Watcher* delegate) {
+bool MessageLoopForIO::WatchFileDescriptor(
+    int fd,
+    bool persistent,
+    MessagePumpForIO::Mode mode,
+    MessagePumpForIO::FdWatchController* controller,
+    MessagePumpForIO::FdWatcher* delegate) {
   return ToPumpIO(pump_.get())->WatchFileDescriptor(
       fd,
       persistent,
@@ -553,11 +558,12 @@ bool MessageLoopForIO::WatchFileDescriptor(int fd,
 
 #if defined(OS_FUCHSIA)
 // Additional watch API for native platform resources.
-bool MessageLoopForIO::WatchZxHandle(zx_handle_t handle,
-                                     bool persistent,
-                                     zx_signals_t signals,
-                                     ZxHandleWatchController* controller,
-                                     ZxHandleWatcher* delegate) {
+bool MessageLoopForIO::WatchZxHandle(
+    zx_handle_t handle,
+    bool persistent,
+    zx_signals_t signals,
+    MessagePumpForIO::ZxHandleWatchController* controller,
+    MessagePumpForIO::ZxHandleWatcher* delegate) {
   return ToPumpIO(pump_.get())
       ->WatchZxHandle(handle, persistent, signals, controller, delegate);
 }