Consolidate win/x dispatchers

ash/accelerators/nested_dispatcher_controller_unittest.cc

Index: ash/accelerators/nested_dispatcher_controller_unittest.cc
diff --git a/ash/accelerators/nested_dispatcher_controller_unittest.cc b/ash/accelerators/nested_dispatcher_controller_unittest.cc
index 905b35391a01e5cbcb3549fabe43fff4818ec598..c24bd475634e9866418d5520f48b4a1bc198e72d 100644
--- a/ash/accelerators/nested_dispatcher_controller_unittest.cc
+++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc
@@ -15,6 +15,7 @@
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/base/accelerators/accelerator.h"
+#include "ui/base/events.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
@@ -33,21 +34,14 @@ class MockDispatcher : public MessageLoop::Dispatcher {
 
   int num_key_events_dispatched() { return num_key_events_dispatched_; }
 
-#if defined(OS_WIN)
-  virtual bool Dispatch(const MSG& msg) OVERRIDE {
-    if (msg.message == WM_KEYUP)
+#if defined(OS_WIN) || defined(USE_X11)
+  virtual base::DispatchStatus Dispatch(
+      const base::NativeEvent& event) OVERRIDE {
+    if (ui::EventTypeFromNative(event) == ui::ET_KEY_RELEASED)
       num_key_events_dispatched_++;
-    return !ui::IsNoopEvent(msg);
+    return ui::IsNoopEvent(event) ? base::EVENT_QUIT : base::EVENT_PROCESSED;
   }
-#elif defined(USE_X11)
-  virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
-      XEvent* xev) OVERRIDE {
-    if (xev->type == KeyRelease)
-      num_key_events_dispatched_++;
-    return ui::IsNoopEvent(xev) ? MessagePumpDispatcher::EVENT_QUIT :
-        MessagePumpDispatcher::EVENT_IGNORED;
-  }
-#endif
+#endif  //  defined(OS_WIN) || defined(USE_X11)
 
  private:
   int num_key_events_dispatched_;