Consolidate win/x dispatchers

ui/gfx/compositor/test/test_compositor_host_linux.cc

Index: ui/gfx/compositor/test/test_compositor_host_linux.cc
diff --git a/ui/gfx/compositor/test/test_compositor_host_linux.cc b/ui/gfx/compositor/test/test_compositor_host_linux.cc
index 61578b88ab78d4c4702a9c3845154e549cb721a1..f11ecd52f1f3309b1d547c7f67214d84348c8b57 100644
--- a/ui/gfx/compositor/test/test_compositor_host_linux.cc
+++ b/ui/gfx/compositor/test/test_compositor_host_linux.cc
@@ -38,12 +38,7 @@ class TestCompositorHostLinux : public TestCompositorHost,
   virtual void ScheduleDraw() OVERRIDE;
 
   // Overridden from MessagePumpDispatcher:
-#if defined(USE_AURA)
-  virtual base::MessagePumpDispatcher::DispatchStatus
-    Dispatch(XEvent* xev) OVERRIDE;
-#elif defined(TOOLKIT_GTK)
-  virtual bool Dispatch(GdkEvent* event) OVERRIDE;
-#endif
+  virtual bool Dispatch(const base::NativeEvent& msg) OVERRIDE;
 
   void Draw();
 
@@ -104,16 +99,9 @@ void TestCompositorHostLinux::ScheduleDraw() {
   }
 }
 
-#if defined(USE_AURA)
-base::MessagePumpDispatcher::DispatchStatus TestCompositorHostLinux::Dispatch(
-    XEvent* xev) {
-  return MessagePumpDispatcher::EVENT_IGNORED;
+bool TestCompositorHostLinux::Dispatch(const base::NativeEvent& event) {

[sky, 2012/04/09 14:38:59]

event-> msg (or change 41 to event).

[oshima, 2012/04/09 17:56:09]

changed 41

+  return true;
 }
-#elif defined(TOOLKIT_GTK)
-bool TestCompositorHostLinux::Dispatch(GdkEvent*) {
-  return false;
-}
-#endif
 
 void TestCompositorHostLinux::Draw() {
   if (compositor_.get())