Use FileDescriptorWatcher in wl::FakeServer.

ui/ozone/platform/wayland/fake_server.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_WAYLAND_FAKE_SERVER_H_
 #define UI_OZONE_PLATFORM_WAYLAND_FAKE_SERVER_H_
 
 #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"
 #include "ui/gfx/geometry/rect.h"
 
 struct wl_client;
 struct wl_display;
 struct wl_event_loop;
 struct wl_global;
 struct wl_resource;
@@ skipping 153 matching lines @@
   MOCK_METHOD1(Pong, void(uint32_t serial));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockXdgShell);
 };
 
 struct DisplayDeleter {
   void operator()(wl_display* display);
 };
 
-class FakeServer : public base::Thread, base::MessagePumpLibevent::Watcher {
+class FakeServer : public base::Thread {
  public:
   FakeServer();
   ~FakeServer() override;
 
   // Start the fake Wayland server. If this succeeds, the WAYLAND_SOCKET
   // environment variable will be set to the string representation of a file
   // descriptor that a client can connect to. The caller is responsible for
   // ensuring that this file descriptor gets closed (for example, by calling
   // wl_display_connect).
   bool Start();
@@ skipping 10 matching lines @@
     return resource ? T::FromResource(resource) : nullptr;
   }
 
   MockSeat* seat() { return &seat_; }
   MockXdgShell* xdg_shell() { return &xdg_shell_; }
   MockOutput* output() { return &output_; }
 
  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;
   wl_event_loop* event_loop_ = nullptr;
 
   base::WaitableEvent pause_event_;
   base::WaitableEvent resume_event_;
 
   // Represent Wayland global objects
   MockCompositor compositor_;
   MockOutput output_;
   MockSeat seat_;
   MockXdgShell xdg_shell_;
 
-  base::MessagePumpLibevent::FileDescriptorWatcher controller_;
+  std::unique_ptr<base::FileDescriptorWatcher::Controller> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeServer);
 };
 
 }  // namespace wl
 
 #endif  // UI_OZONE_PLATFORM_WAYLAND_FAKE_SERVER_H_