Refactor the glib message-pump, and use it as the base for a gtk message pump and an X message pump.

chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.cc

 // Copyright (c) 2011 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.
 
 // TODO(yusukes): Remove the #if once the ARM bot (crbug.com/84694) is fixed.
 #if defined(HAVE_XINPUT2)
 
 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
 
 #include <gdk/gdkx.h>
@@ skipping 78 matching lines @@
 
 #if defined(TOUCH_UI)
   MessageLoopForUI::current()->RemoveObserver(this);
 #else
   gdk_window_remove_filter(NULL, GdkEventFilter, this);
 #endif
   stopped_ = true;
   xiopcode_ = -1;
 }
 
+#if defined(TOUCH_UI)
+base::MessagePumpObserver::EventStatus
+    XInputHierarchyChangedEventListener::WillProcessXEvent(XEvent* xevent) {
+  return ProcessedXEvent(xevent) ? EVENT_HANDLED : EVENT_CONTINUE;
+}
+#else  // defined(TOUCH_UI)
 // static
 GdkFilterReturn XInputHierarchyChangedEventListener::GdkEventFilter(
     GdkXEvent* gxevent, GdkEvent* gevent, gpointer data) {
   XInputHierarchyChangedEventListener* listener =
       static_cast<XInputHierarchyChangedEventListener*>(data);
   XEvent* xevent = static_cast<XEvent*>(gxevent);
 
-  return listener->WillProcessXEvent(xevent) ? GDK_FILTER_REMOVE
-                                             : GDK_FILTER_CONTINUE;
+  return listener->ProcessedXEvent(xevent) ? GDK_FILTER_REMOVE
+                                           : GDK_FILTER_CONTINUE;
 }
+#endif  // defined(TOUCH_UI)
 
-bool XInputHierarchyChangedEventListener::WillProcessXEvent(XEvent* xevent) {
+bool XInputHierarchyChangedEventListener::ProcessedXEvent(XEvent* xevent) {
   if ((xevent->xcookie.type != GenericEvent) ||
       (xevent->xcookie.extension != xiopcode_)) {
     return false;
   }
   if (!XGetEventData(xevent->xgeneric.display, &xevent->xcookie)) {
     VLOG(1) << "XGetEventData failed";
     return false;
   }
 
   XGenericEventCookie* cookie = &(xevent->xcookie);
   const bool should_consume = (cookie->evtype == XI_HierarchyChanged);
   if (should_consume) {
     HandleHierarchyChangedEvent(static_cast<XIHierarchyEvent*>(cookie->data));
   }
   XFreeEventData(xevent->xgeneric.display, cookie);
 
   return should_consume;
 }
 
 }  // namespace chromeos
 
 #endif
 
 // TODO(yusukes): Remove this check when crbug.com/84694 is resolved.
 #if defined(ARCH_CPU_X86_FAMILY) && !defined(HAVE_XINPUT2)
 #error XINPUT2 should always be enabled on Chrome OS x86!
 #endif