Revert of chrome: Add support for use_glib=true to wayland server.

chrome/browser/chrome_browser_main_extra_parts_exo.cc

Index: chrome/browser/chrome_browser_main_extra_parts_exo.cc
diff --git a/chrome/browser/chrome_browser_main_extra_parts_exo.cc b/chrome/browser/chrome_browser_main_extra_parts_exo.cc
index d13c14d97a7289e0a42c540e65bfa0850bf89905..9cecfbd30bccbe8f276489eef488d06268d68c34 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_exo.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_exo.cc
@@ -3,10 +3,6 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
-
-#if defined(USE_GLIB)
-#include <glib.h>
-#endif
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ -16,61 +12,6 @@
 #include "components/exo/wayland/server.h"
 #include "content/public/browser/browser_thread.h"
 
-#if defined(USE_GLIB)
-namespace {
-
-gboolean WaylandSourcePrepare(GSource* source, gint* timeout_ms) {
-  *timeout_ms = -1;
-  return FALSE;
-}
-
-gboolean WaylandSourceCheck(GSource* source) {
-  return TRUE;
-}
-
-gboolean WaylandSourceDispatch(GSource* source,
-                               GSourceFunc unused_func,
-                               gpointer data) {
-  exo::wayland::Server* server = static_cast<exo::wayland::Server*>(data);
-  server->Dispatch(base::TimeDelta());
-  server->Flush();
-  return TRUE;
-}
-
-GSourceFuncs g_wayland_source_funcs = {WaylandSourcePrepare, WaylandSourceCheck,
-                                       WaylandSourceDispatch, nullptr};
-
-}  // namespace
-
-class ChromeBrowserMainExtraPartsExo::WaylandWatcher {
- public:
-  explicit WaylandWatcher(exo::wayland::Server* server)
-      : wayland_poll_(new GPollFD),
-        wayland_source_(
-            g_source_new(&g_wayland_source_funcs, sizeof(GSource))) {
-    wayland_poll_->fd = server->GetFileDescriptor();
-    wayland_poll_->events = G_IO_IN;
-    wayland_poll_->revents = 0;
-    g_source_add_poll(wayland_source_, wayland_poll_.get());
-    g_source_set_can_recurse(wayland_source_, TRUE);
-    g_source_set_callback(wayland_source_, nullptr, server, nullptr);
-    g_source_attach(wayland_source_, g_main_context_default());
-  }
-  ~WaylandWatcher() {
-    g_source_destroy(wayland_source_);
-    g_source_unref(wayland_source_);
-  }
-
- private:
-  // The poll attached to |wayland_source_|.
-  scoped_ptr<GPollFD> wayland_poll_;
-
-  // The GLib event source for wayland events.
-  GSource* wayland_source_;
-
-  DISALLOW_COPY_AND_ASSIGN(WaylandWatcher);
-};
-#else
 class ChromeBrowserMainExtraPartsExo::WaylandWatcher
     : public base::MessagePumpLibevent::Watcher {
  public:
@@ -94,7 +35,6 @@
 
   DISALLOW_COPY_AND_ASSIGN(WaylandWatcher);
 };
-#endif
 
 ChromeBrowserMainExtraPartsExo::ChromeBrowserMainExtraPartsExo()
     : display_(new exo::Display) {}