[master] x11: Move X event handling out of the message-pump.

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 cc0a3525d0dc451f30eafd9bc21eb5e5505f7d19..db8cb4aec9bbddd8894b9f7361f2fb872e53ad75 100644
--- a/ash/accelerators/nested_dispatcher_controller_unittest.cc
+++ b/ash/accelerators/nested_dispatcher_controller_unittest.cc
@@ -16,6 +16,7 @@
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/platform/platform_event_source.h"
 #include "ui/wm/public/dispatcher_client.h"
 
 #if defined(USE_X11)
@@ -96,7 +97,22 @@ void DispatchKeyReleaseA() {
 
 }  // namespace
 
-typedef AshTestBase NestedDispatcherTest;
+class NestedDispatcherTest : public AshTestBase {
+ public:
+  NestedDispatcherTest() {}
+  virtual ~NestedDispatcherTest() {}
+
+  // AshTestBase:
+  virtual void SetUp() OVERRIDE {
+    event_source_ = ui::PlatformEventSource::CreateDefault();
+    AshTestBase::SetUp();
+  }
+
+ private:
+  scoped_ptr<ui::PlatformEventSource> event_source_;
+
+  DISALLOW_COPY_AND_ASSIGN(NestedDispatcherTest);
+};
 
 // Aura window above lock screen in z order.
 TEST_F(NestedDispatcherTest, AssociatedWindowAboveLockScreen) {