Use FileDescriptorWatcher in wl::FakeServer.

ui/ozone/platform/wayland/fake_server.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/ozone/platform/wayland/fake_server.h"
 
 #include <sys/socket.h>
 #include <wayland-server.h>
 #include <xdg-shell-unstable-v5-server-protocol.h>
 
@@ skipping 349 matching lines @@
     return false;
   if (!xdg_shell_.Initialize(display_.get()))
     return false;
 
   client_ = wl_client_create(display_.get(), server_fd.get());
   if (!client_)
     return false;
   (void)server_fd.release();
 
   base::Thread::Options options;
-  options.message_pump_factory =
-      base::Bind(&FakeServer::CreateMessagePump, base::Unretained(this));
+  options.message_loop_type = MessageLoop::TYPE_IO;
   if (!base::Thread::StartWithOptions(options))
     return false;
+  task_runner()->PostTask(FROM_HERE,
+                          base::Bind(&FakeServer::StartWatchingFileDescriptor,
+                                     base::Unretained(this)));
 
   setenv("WAYLAND_SOCKET", base::UintToString(client_fd.release()).c_str(), 1);
 
   return true;
 }
 
 void FakeServer::Pause() {
   task_runner()->PostTask(
       FROM_HERE, base::Bind(&FakeServer::DoPause, base::Unretained(this)));
   pause_event_.Wait();
 }
 
 void FakeServer::Resume() {
   if (display_)
     wl_display_flush_clients(display_.get());
   resume_event_.Signal();
 }
 
 void FakeServer::DoPause() {
   base::RunLoop().RunUntilIdle();
   pause_event_.Signal();
   resume_event_.Wait();
 }
 
-std::unique_ptr<base::MessagePump> FakeServer::CreateMessagePump() {
-  auto pump = base::WrapUnique(new base::MessagePumpLibevent);
-  pump->WatchFileDescriptor(wl_event_loop_get_fd(event_loop_), true,
-                            base::MessagePumpLibevent::WATCH_READ, &controller_,
-                            this);
-  return std::move(pump);
+void FakeServer::StartWatchingFileDescriptor() {
+  controller_ = base::FileDescriptorWatcher::WatchReadable(
+      wl_event_loop_get_fd(event_loop_),
+      base::Bind(&FakeServer::OnFileCanReadWithoutBlocking,
+                 base::Unretained(this)));
 }
 
-void FakeServer::OnFileCanReadWithoutBlocking(int fd) {
+void FakeServer::OnFileCanReadWithoutBlocking() {
   wl_event_loop_dispatch(event_loop_, 0);
   wl_display_flush_clients(display_.get());
 }
 
-void FakeServer::OnFileCanWriteWithoutBlocking(int fd) {}
 
 }  // namespace wl