Use FileDescriptorWatcher in wl::FakeServer.

ui/ozone/platform/wayland/fake_server.h

Index: ui/ozone/platform/wayland/fake_server.h
diff --git a/ui/ozone/platform/wayland/fake_server.h b/ui/ozone/platform/wayland/fake_server.h
index 8aa5e181ed851813e7455f3038b5edf385491fcd..fe97c2aef90d9b241aa3e4948e45b215ac99629d 100644
--- a/ui/ozone/platform/wayland/fake_server.h
+++ b/ui/ozone/platform/wayland/fake_server.h
@@ -7,8 +7,10 @@
 
 #include <wayland-server-core.h>
 
+#include <memory>
+
 #include "base/bind.h"
-#include "base/message_loop/message_pump_libevent.h"
+#include "base/files/file_descriptor_watcher_posix.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -182,7 +184,7 @@ struct DisplayDeleter {
   void operator()(wl_display* display);
 };
 
-class FakeServer : public base::Thread, base::MessagePumpLibevent::Watcher {
+class FakeServer : public base::Thread {
  public:
   FakeServer();
   ~FakeServer() override;
@@ -213,11 +215,9 @@ class FakeServer : public base::Thread, base::MessagePumpLibevent::Watcher {
  private:
   void DoPause();
 
-  std::unique_ptr<base::MessagePump> CreateMessagePump();
+  void StartWatchingFileDescriptor();
 
-  // base::MessagePumpLibevent::Watcher
-  void OnFileCanReadWithoutBlocking(int fd) override;
-  void OnFileCanWriteWithoutBlocking(int fd) override;
+  void OnFileCanReadWithoutBlocking();
 
   std::unique_ptr<wl_display, DisplayDeleter> display_;
   wl_client* client_ = nullptr;
@@ -232,7 +232,7 @@ class FakeServer : public base::Thread, base::MessagePumpLibevent::Watcher {
   MockSeat seat_;
   MockXdgShell xdg_shell_;
 
-  base::MessagePumpLibevent::FileDescriptorWatcher controller_;
+  std::unique_ptr<base::FileDescriptorWatcher::Controller> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeServer);
 };